# HG changeset patch # User Sebastien Jodogne # Date 1579948043 -3600 # Node ID b03854e0f7965827c0f4591a8c2fc0c33589c0ca # Parent 02a4eaa76a256e3158f42a65237894b20d6a3cc7 trying to fix output folders for OS X and windows diff -r 02a4eaa76a25 -r b03854e0f796 CMakeLists.txt --- a/CMakeLists.txt Sat Jan 25 10:52:02 2020 +0100 +++ b/CMakeLists.txt Sat Jan 25 11:27:23 2020 +0100 @@ -469,7 +469,7 @@ include(ExternalProject) set(Flags) - + if (CMAKE_TOOLCHAIN_FILE) # Take absolute path to the toolchain get_filename_component(TMP ${CMAKE_TOOLCHAIN_FILE} REALPATH BASE ${CMAKE_SOURCE_DIR}) @@ -496,6 +496,12 @@ ${Flags} ) + if (DEFINED CMAKE_RUNTIME_OUTPUT_DIRECTORY) + set(Target ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) + else() + set(Target ${CMAKE_CURRENT_BINARY_DIR}) + endif() + if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") if (MSVC) set(Prefix "") @@ -504,14 +510,14 @@ endif() install(FILES - ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${Prefix}ConnectivityChecks.dll + ${Target}/${Prefix}ConnectivityChecks.dll DESTINATION "lib") else() list(GET CMAKE_FIND_LIBRARY_PREFIXES 0 Prefix) list(GET CMAKE_FIND_LIBRARY_SUFFIXES 0 Suffix) install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/${Prefix}ConnectivityChecks${Suffix} - ${CMAKE_CURRENT_BINARY_DIR}/${Prefix}ConnectivityChecks${Suffix}.${ORTHANC_VERSION} + ${Target}/${Prefix}ConnectivityChecks${Suffix} + ${Target}/${Prefix}ConnectivityChecks${Suffix}.${ORTHANC_VERSION} DESTINATION "share/orthanc/plugins") endif() endif()