diff options
| author | Eduard Braun <Eduard.Braun2@gmx.de> | 2017-06-15 00:50:29 +0000 |
|---|---|---|
| committer | Eduard Braun <Eduard.Braun2@gmx.de> | 2017-06-16 14:32:33 +0000 |
| commit | e15a3ec8474ddc79d4763b453cc27e5210beba41 (patch) | |
| tree | db866cb86c80bdea1c6321d6aacc64b2489d0389 | |
| parent | Fix compilation on Windows by removing duplicate dependencies (diff) | |
| download | inkscape-e15a3ec8474ddc79d4763b453cc27e5210beba41.tar.gz inkscape-e15a3ec8474ddc79d4763b453cc27e5210beba41.zip | |
Use CMAKE_RUNTIME_OUTPUT_DIRECTORY instead of the old EXECUTABLE_OUTPUT_PATH (notably this includes shared libraries on Windows which should end up together with the executables)
Also use CMAKE_LIBRARY_OUTPUT_DIRECTORY instead of the old LIBRARY_OUTPUT_PATH
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | testfiles/CMakeLists.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7cb82492c..b9c28926e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -70,8 +70,8 @@ set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING # ----------------------------------------------------------------------------- # Redirect output files # ----------------------------------------------------------------------------- -set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE INTERNAL "" ) -set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "" ) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin CACHE PATH "Output directory for runtime binaries") +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib CACHE PATH "Output directory for libraries") # ----------------------------------------------------------------------------- # Options diff --git a/testfiles/CMakeLists.txt b/testfiles/CMakeLists.txt index 2b2f9b821..933d8478c 100644 --- a/testfiles/CMakeLists.txt +++ b/testfiles/CMakeLists.txt @@ -27,7 +27,7 @@ set(TEST_LIBS foreach(source ${TEST_SOURCES}) add_executable(${source} src/${source}.cpp unittest.cpp doc-per-case-test.cpp) target_link_libraries(${source} ${TEST_LIBS}) - add_test(NAME ${source} COMMAND ${EXECUTABLE_OUTPUT_PATH}/${source}) + add_test(NAME ${source} COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${source}) add_dependencies(${source} inkscape_version) add_dependencies(check ${source}) endforeach()
\ No newline at end of file |