# HG changeset patch # User Sebastien Jodogne # Date 1579883834 -3600 # Node ID a6bfa09df8b3f0d03202d7125765651dffd6f05b # Parent 8afc14fab01f7921e5be72d46410a05ae858dc74 fix for cis diff -r 8afc14fab01f -r a6bfa09df8b3 CMakeLists.txt --- a/CMakeLists.txt Fri Jan 24 17:06:23 2020 +0100 +++ b/CMakeLists.txt Fri Jan 24 17:37:14 2020 +0100 @@ -488,16 +488,13 @@ CMAKE_ARGS -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} + -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR} -DPLUGIN_VERSION=${ORTHANC_VERSION} -DSTATIC_BUILD=${STATIC_BUILD} -DUSE_LEGACY_JSONCPP=${USE_LEGACY_JSONCPP} ${Flags} - - INSTALL_COMMAND "" # Skip the install step ) - ExternalProject_Get_Property(ConnectivityChecksProject binary_dir) - if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") if (MSVC) set(Prefix "") @@ -506,14 +503,14 @@ endif() install(FILES - ${binary_dir}/${Prefix}OrthancChecks.dll + ${CMAKE_CURRENT_BINARY_DIR}/${Prefix}OrthancChecks.dll DESTINATION "lib") else() list(GET CMAKE_FIND_LIBRARY_PREFIXES 0 Prefix) list(GET CMAKE_FIND_LIBRARY_SUFFIXES 0 Suffix) install(FILES - ${binary_dir}/${Prefix}OrthancChecks${Suffix} - ${binary_dir}/${Prefix}OrthancChecks${Suffix}.${ORTHANC_VERSION} + ${CMAKE_CURRENT_BINARY_DIR}/${Prefix}OrthancChecks${Suffix} + ${CMAKE_CURRENT_BINARY_DIR}/${Prefix}OrthancChecks${Suffix}.${ORTHANC_VERSION} DESTINATION "share/orthanc/plugins") endif() endif() diff -r 8afc14fab01f -r a6bfa09df8b3 Plugins/Samples/ConnectivityChecks/CMakeLists.txt --- a/Plugins/Samples/ConnectivityChecks/CMakeLists.txt Fri Jan 24 17:06:23 2020 +0100 +++ b/Plugins/Samples/ConnectivityChecks/CMakeLists.txt Fri Jan 24 17:37:14 2020 +0100 @@ -58,3 +58,8 @@ VERSION ${PLUGIN_VERSION} SOVERSION ${PLUGIN_VERSION} ) + +install( + TARGETS OrthancChecks + DESTINATION . + )