Mercurial > hg > orthanc

changeset 3623:a6bfa09df8b3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix for cis
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 24 Jan 2020 17:37:14 +0100
parents 8afc14fab01f
children b53cab5bad84
files CMakeLists.txt Plugins/Samples/ConnectivityChecks/CMakeLists.txt
diffstat 2 files changed, 9 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- 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()
--- 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 .
+  )