diff options
| author | Přemysl Eric Janouch <p@janouch.name> | 2021-11-01 10:34:28 +0100 |
|---|---|---|
| committer | Přemysl Eric Janouch <p@janouch.name> | 2021-11-01 11:57:01 +0100 |
| commit | 082f1aa41c9d08fcb72e0af14ce5f3475c93482b (patch) | |
| tree | 5aff7b92caf55c4924589619359a3613fd644a59 | |
| parent | 8950a533b414c39d9bf15b87ae57f28f5b4f154e (diff) | |
| download | logdiag-082f1aa41c9d08fcb72e0af14ce5f3475c93482b.tar.gz logdiag-082f1aa41c9d08fcb72e0af14ce5f3475c93482b.tar.xz logdiag-082f1aa41c9d08fcb72e0af14ce5f3475c93482b.zip | |
CMakeLists.txt: shuffle things around
| -rw-r--r-- | CMakeLists.txt | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 98f0829..1557bb4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -155,34 +155,33 @@ if (WIN32) list (APPEND logdiag_SOURCES share/logdiag.rc) endif () -# Generate a configure file -add_definitions (-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_36) -add_definitions (-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_36) -configure_file (config.h.in ${PROJECT_BINARY_DIR}/config.h) -include_directories (${PROJECT_BINARY_DIR}) - # Generate marshallers -find_program (GLIB_GENMARSHAL_EXECUTABLE glib-genmarshal) -if (NOT GLIB_GENMARSHAL_EXECUTABLE) - message (FATAL_ERROR "glib-genmarshal not found") -endif () - function (glib_genmarshal listfile prefix) - get_filename_component (basename "${listfile}" NAME_WE) - set (command_base ${GLIB_GENMARSHAL_EXECUTABLE} --prefix ${prefix} + find_program (GLIB_GENMARSHAL_EXECUTABLE glib-genmarshal) + if (NOT GLIB_GENMARSHAL_EXECUTABLE) + message (FATAL_ERROR "glib-genmarshal not found") + endif () + + get_filename_component (_basename "${listfile}" NAME_WE) + set (_command_base ${GLIB_GENMARSHAL_EXECUTABLE} --prefix ${prefix} "${listfile}") - add_custom_command (OUTPUT ${basename}.c ${basename}.h - COMMAND ${command_base} --body > ${basename}.c - COMMAND ${command_base} --header > ${basename}.h + add_custom_command (OUTPUT ${_basename}.c ${_basename}.h + COMMAND ${_command_base} --body > ${_basename}.c + COMMAND ${_command_base} --header > ${_basename}.h DEPENDS "${listfile}" COMMENT "Generating marshallers source files" VERBATIM) endfunction () glib_genmarshal (${PROJECT_SOURCE_DIR}/liblogdiag/ld-marshal.list ld_marshal) -include_directories (${PROJECT_SOURCE_DIR}) -include_directories (${GTK3_INCLUDE_DIRS} ${Lua_INCLUDE_DIRS}) +# Generate a configure file +add_definitions (-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_36) +add_definitions (-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_36) +configure_file (config.h.in ${PROJECT_BINARY_DIR}/config.h) + +include_directories (${PROJECT_SOURCE_DIR} ${PROJECT_BINARY_DIR} + ${GTK3_INCLUDE_DIRS} ${Lua_INCLUDE_DIRS}) set (logdiag_LIBS ${GTK3_LIBRARIES} ${Lua_LIBRARIES} m) if (WIN32) |