diff options
| author | Christian Dywan <christian@twotoasts.de> | 2018-10-09 15:12:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-09 15:12:41 +0200 |
| commit | 0b60bc841f7e1436756edaa25347d3da581d2739 (patch) | |
| tree | b51b4fe790cd43c647a8f26e302235c70ed0de0a /core/CMakeLists.txt | |
| parent | 91b4e3cc8aa818e810da4d35d3322e980b5af027 (diff) | |
| download | midori-git-0b60bc841f7e1436756edaa25347d3da581d2739.tar.gz | |
Revise generated files once more (#83)
The custom commands (read: generated files) with proper dependencies
introduced in #77 don't work well at all.
Diffstat (limited to 'core/CMakeLists.txt')
| -rw-r--r-- | core/CMakeLists.txt | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 74c24fd1..23761abd 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -39,15 +39,17 @@ CUSTOM_VAPIS ) file(GLOB UI_FILES ${CMAKE_SOURCE_DIR}/ui/*.ui) -add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/resources.c - COMMAND glib-compile-resources +find_program (GLIB_COMPILE_RESOURCES_BIN glib-compile-resources) +add_custom_command(OUTPUT resources.c + COMMAND ${GLIB_COMPILE_RESOURCES_BIN} --sourcedir ${CMAKE_SOURCE_DIR} --generate-source --target ${CMAKE_CURRENT_BINARY_DIR}/resources.c ${CMAKE_SOURCE_DIR}/gresource.xml DEPENDS ${CMAKE_SOURCE_DIR}/gresource.xml + DEPENDS ${CMAKE_SOURCE_DIR}/data/gtk3.css DEPENDS ${UI_FILES} -) + ) add_library("${LIBCORE}" SHARED ${LIBCORE_SOURCE_C} ${CMAKE_CURRENT_BINARY_DIR}/resources.c) target_link_libraries("${LIBCORE}" @@ -63,11 +65,11 @@ set_target_properties("${LIBCORE}" PROPERTIES ) find_program (GIR_COMPILER_BIN g-ir-compiler) -add_custom_command(OUTPUT "g-ir-compiler_${LIBCORE}" - COMMAND ${GIR_COMPILER_BIN} ${CMAKE_CURRENT_BINARY_DIR}/${LIBCORE_GIR}.gir - --output ${CMAKE_CURRENT_BINARY_DIR}/${LIBCORE_GIR}.typelib - WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" - DEPENDS ${LIBCORE_GIR}.gir) +add_custom_target(${LIBCORE_GIR}.typelib ALL + COMMAND ${GIR_COMPILER_BIN} ${CMAKE_CURRENT_BINARY_DIR}/${LIBCORE_GIR}.gir + --output ${CMAKE_CURRENT_BINARY_DIR}/${LIBCORE_GIR}.typelib + DEPENDS ${LIBCORE_GIR}.gir + ) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${LIBCORE_GIR}.gir" DESTINATION "${CMAKE_INSTALL_DATADIR}/gir-1.0/") install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${LIBCORE_GIR}.typelib" |