[example/CMakeLists.txt] Use `glfw` as target name for `glfw3` found package; [src/CMakeLists.txt] Fix `fix_comments` implementation; improve whitespace consistency with Python implementation
This commit is contained in:
parent
0761cfc6c1
commit
ac7e89a2e6
|
@ -8,7 +8,7 @@ find_package(OpenGL REQUIRED)
|
||||||
|
|
||||||
include("${CMAKE_SOURCE_DIR}/cmake/modules/CMakeFindM.cmake")
|
include("${CMAKE_SOURCE_DIR}/cmake/modules/CMakeFindM.cmake")
|
||||||
|
|
||||||
set(deps "glfw3" "GLEW::GLEW" "OpenGL::GL" "${M_LIBRARIES}")
|
set(deps "glfw" "GLEW::GLEW" "OpenGL::GL" "${M_LIBRARIES}")
|
||||||
if (APPLE)
|
if (APPLE)
|
||||||
#SET(GUI_TYPE MACOSX_BUNDLE)
|
#SET(GUI_TYPE MACOSX_BUNDLE)
|
||||||
#INCLUDE_DIRECTORIES ( /Developer/Headers/FlatCarbon )
|
#INCLUDE_DIRECTORIES ( /Developer/Headers/FlatCarbon )
|
||||||
|
|
|
@ -65,8 +65,7 @@ function (omit_includes new_file_contents file_contents blacklist)
|
||||||
endfunction (omit_includes new_file_contents file_contents blacklist)
|
endfunction (omit_includes new_file_contents file_contents blacklist)
|
||||||
|
|
||||||
function (fix_comments new_contents contents)
|
function (fix_comments new_contents contents)
|
||||||
# TODO: Fix this `fix_comments` implementation
|
string(REGEX REPLACE "//(.*)" "/*1 */" _contents "${contents}")
|
||||||
string(REGEX REPLACE "^//\(.*\)" "/*\\1 */" _contents "${contents}")
|
|
||||||
set(${new_contents} "${_contents}" PARENT_SCOPE)
|
set(${new_contents} "${_contents}" PARENT_SCOPE)
|
||||||
endfunction (fix_comments new_contents contents)
|
endfunction (fix_comments new_contents contents)
|
||||||
|
|
||||||
|
@ -95,7 +94,7 @@ if (BUILD_HEADER_ONLY)
|
||||||
foreach (filename ${priv1})
|
foreach (filename ${priv1})
|
||||||
file(READ "${filename}" file_contents)
|
file(READ "${filename}" file_contents)
|
||||||
omit_includes(new_file_contents
|
omit_includes(new_file_contents
|
||||||
"${file_contents}"
|
"\n${file_contents}"
|
||||||
"${priv_blacklist}")
|
"${priv_blacklist}")
|
||||||
string(APPEND amalgam_contents "${new_file_contents}")
|
string(APPEND amalgam_contents "${new_file_contents}")
|
||||||
endforeach (filename ${priv1})
|
endforeach (filename ${priv1})
|
||||||
|
@ -112,7 +111,7 @@ if (BUILD_HEADER_ONLY)
|
||||||
"${file_contents}"
|
"${file_contents}"
|
||||||
"${priv_blacklist}")
|
"${priv_blacklist}")
|
||||||
string(APPEND amalgam_contents "${new_file_contents}")
|
string(APPEND amalgam_contents "${new_file_contents}")
|
||||||
endforeach (filename ${priv1})
|
endforeach (filename ${priv2})
|
||||||
|
|
||||||
set(outro_contents "")
|
set(outro_contents "")
|
||||||
foreach (filename ${outro})
|
foreach (filename ${outro})
|
||||||
|
@ -130,8 +129,8 @@ if (BUILD_HEADER_ONLY)
|
||||||
"#ifndef ${macro}_SINGLE_HEADER\n"
|
"#ifndef ${macro}_SINGLE_HEADER\n"
|
||||||
" #define ${macro}_SINGLE_HEADER\n"
|
" #define ${macro}_SINGLE_HEADER\n"
|
||||||
"#endif\n\n"
|
"#endif\n\n"
|
||||||
"${pub_contents}\n"
|
"${pub_contents}"
|
||||||
"#endif /* ${macro}_SINGLE_HEADER */\n\n"
|
#"#endif /* ${macro}_SINGLE_HEADER */\n\n"
|
||||||
|
|
||||||
"#ifdef ${macro}_IMPLEMENTATION\n"
|
"#ifdef ${macro}_IMPLEMENTATION\n"
|
||||||
"${amalgam_contents}"
|
"${amalgam_contents}"
|
||||||
|
|
Loading…
Reference in New Issue