diff options
| author | Marvin W <git@larma.de> | 2017-03-11 23:52:12 +0100 |
|---|---|---|
| committer | Marvin W <git@larma.de> | 2017-03-11 23:58:35 +0100 |
| commit | e27d63269d0b41fa8d5b5f0f2e4a9dc7de4b9ab9 (patch) | |
| tree | 80e547d0e02e770e8bcd912e42f8afa753aeb0f6 /cmake | |
| parent | cd6b904e970291a63551d0f1d80bbd550e778ec8 (diff) | |
| download | dino-e27d63269d0b41fa8d5b5f0f2e4a9dc7de4b9ab9.tar.gz dino-e27d63269d0b41fa8d5b5f0f2e4a9dc7de4b9ab9.zip | |
Move UI code into main dir
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/CompileGResources.cmake | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cmake/CompileGResources.cmake b/cmake/CompileGResources.cmake index e9a8d179..14d2b2c8 100644 --- a/cmake/CompileGResources.cmake +++ b/cmake/CompileGResources.cmake @@ -131,16 +131,16 @@ function(COMPILE_GRESOURCES output xml_out) ("${res}" STREQUAL "TOPIXDATA"))) add_custom_command( - OUTPUT "${CMAKE_BINARY_DIR}/resources/${res}" - COMMAND ${CMAKE_COMMAND} -E copy "${CG_ARG_SOURCE_DIR}/${res}" "${CMAKE_BINARY_DIR}/resources/${res}" + OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/resources/${res}" + COMMAND ${CMAKE_COMMAND} -E copy "${CG_ARG_SOURCE_DIR}/${res}" "${CMAKE_CURRENT_BINARY_DIR}/resources/${res}" MAIN_DEPENDENCY "${CG_ARG_SOURCE_DIR}/${res}") - list(APPEND CG_RESOURCES_DEPENDENCIES "${CMAKE_BINARY_DIR}/resources/${res}") + list(APPEND CG_RESOURCES_DEPENDENCIES "${CMAKE_CURRENT_BINARY_DIR}/resources/${res}") endif() endforeach() # Construct .gresource.xml path. - set(CG_XML_FILE_PATH "${CMAKE_BINARY_DIR}/resources/.gresource.xml") + set(CG_XML_FILE_PATH "${CMAKE_CURRENT_BINARY_DIR}/resources/.gresource.xml") # Generate gresources XML target. list(APPEND CG_CMAKE_SCRIPT_ARGS "-D") @@ -186,13 +186,13 @@ function(COMPILE_GRESOURCES output xml_out) COMMAND ${CMAKE_COMMAND} ARGS ${CG_CMAKE_SCRIPT_ARGS} DEPENDS ${CG_RESOURCES_DEPENDENCIES} - WORKING_DIRECTORY ${CMAKE_BINARY_DIR} + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT ${CG_XML_CUSTOM_COMMAND_COMMENT}) # Create target manually if not set (to make sure glib-compile-resources # doesn't change behaviour with it's naming standards). if (NOT CG_ARG_TARGET) - set(CG_ARG_TARGET "${CMAKE_BINARY_DIR}/resources") + set(CG_ARG_TARGET "${CMAKE_CURRENT_BINARY_DIR}/resources") set(CG_ARG_TARGET "${CG_ARG_TARGET}.${CG_TARGET_FILE_ENDING}") endif() |