Mercurial > hg > orthanc

changeset 4103:c5efe8897da8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rename ORTHANC_INSTALL_DIR as ORTHANC_INSTALL_PREFIX for more consistency with CMake
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 06 Jul 2020 10:59:11 +0200
parents 2ace6dc9b1d7
children d5c09b5f882f
files OrthancFramework/SharedLibrary/CMakeLists.txt OrthancFramework/SharedLibrary/NOTES.txt
diffstat 2 files changed, 8 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancFramework/SharedLibrary/CMakeLists.txt	Mon Jul 06 10:54:59 2020 +0200
+++ b/OrthancFramework/SharedLibrary/CMakeLists.txt	Mon Jul 06 10:59:11 2020 +0200
@@ -20,7 +20,7 @@
 # *Do not* use CMAKE_INSTALL_PREFIX, otherwise CMake automatically
 # adds CMAKE_INSTALL_PREFIX to the include_directories(), which causes
 # issues if re-building the shared library after install!
-set(ORTHANC_INSTALL_DIR "/tmp/install" CACHE PATH "")
+set(ORTHANC_INSTALL_PREFIX "/tmp/install" CACHE PATH "")
 SET(UNIT_TESTS_WITH_HTTP_CONNEXIONS ON CACHE BOOL "Allow unit tests to make HTTP requests")
 
 
@@ -431,20 +431,20 @@
 
 install(
   TARGETS OrthancFramework
-  RUNTIME DESTINATION ${ORTHANC_INSTALL_DIR}/lib    # Destination for Windows
-  LIBRARY DESTINATION ${ORTHANC_INSTALL_DIR}/lib    # Destination for Linux
+  RUNTIME DESTINATION ${ORTHANC_INSTALL_PREFIX}/lib    # Destination for Windows
+  LIBRARY DESTINATION ${ORTHANC_INSTALL_PREFIX}/lib    # Destination for Linux
   )
 
 if (CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
   install(FILES
     ${CMAKE_CURRENT_BINARY_DIR}/OrthancFramework.wasm
-    DESTINATION ${ORTHANC_INSTALL_DIR}/lib
+    DESTINATION ${ORTHANC_INSTALL_PREFIX}/lib
     )
 endif()
 
 install(
   DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Include/
-  DESTINATION ${ORTHANC_INSTALL_DIR}/include/
+  DESTINATION ${ORTHANC_INSTALL_PREFIX}/include/
   )
 
 
--- a/OrthancFramework/SharedLibrary/NOTES.txt	Mon Jul 06 10:54:59 2020 +0200
+++ b/OrthancFramework/SharedLibrary/NOTES.txt	Mon Jul 06 10:59:11 2020 +0200
@@ -1,7 +1,8 @@
 
 
-NB: CMake option "ORTHANC_INSTALL_DIR" can be used to specify an
-installation directory (to be used with "ninja install").
+NB: CMake option "ORTHANC_INSTALL_PREFIX" can be used to specify an
+installation directory (to be used with "make install" or "ninja
+install").
 
 
 Dynamic linking under Ubuntu 18.04