comparison CMakeLists.txt @ 46:3e2ff3616e57

sync
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 04 Aug 2020 13:31:27 +0200
parents 2468e2f2456c
children 42de8b600c0c
comparison
equal deleted inserted replaced
45:ee76cced46a5 46:3e2ff3616e57
33 33
34 34
35 # Download and setup the Orthanc framework 35 # Download and setup the Orthanc framework
36 include(${CMAKE_SOURCE_DIR}/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake) 36 include(${CMAKE_SOURCE_DIR}/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake)
37 37
38 include_directories(${ORTHANC_FRAMEWORK_ROOT})
39
38 if (ORTHANC_FRAMEWORK_SOURCE STREQUAL "system") 40 if (ORTHANC_FRAMEWORK_SOURCE STREQUAL "system")
39 #link_libraries(${ORTHANC_FRAMEWORK_LIBRARIES}) 41 #link_libraries(${ORTHANC_FRAMEWORK_LIBRARIES})
40 42
41 else() 43 else()
42 include(${ORTHANC_FRAMEWORK_ROOT}/Resources/CMake/OrthancFrameworkParameters.cmake) 44 include(${ORTHANC_FRAMEWORK_ROOT}/../Resources/CMake/OrthancFrameworkParameters.cmake)
43 45
44 #set(ENABLE_MODULE_IMAGES OFF CACHE INTERNAL "") 46 #set(ENABLE_MODULE_IMAGES OFF CACHE INTERNAL "")
45 #set(ENABLE_MODULE_JOBS OFF CACHE INTERNAL "") 47 #set(ENABLE_MODULE_JOBS OFF CACHE INTERNAL "")
46 #set(ENABLE_MODULE_DICOM OFF CACHE INTERNAL "") 48 #set(ENABLE_MODULE_DICOM OFF CACHE INTERNAL "")
47 49
48 include(${ORTHANC_FRAMEWORK_ROOT}/Resources/CMake/OrthancFrameworkConfiguration.cmake) 50 include(${ORTHANC_FRAMEWORK_ROOT}/../Resources/CMake/OrthancFrameworkConfiguration.cmake)
49 include_directories(${ORTHANC_FRAMEWORK_ROOT}/Sources)
50 endif() 51 endif()
51 52
52 53
53 include(${CMAKE_SOURCE_DIR}/Resources/Orthanc/Plugins/OrthancPluginsExports.cmake) 54 include(${CMAKE_SOURCE_DIR}/Resources/Orthanc/Plugins/OrthancPluginsExports.cmake)
54 55
109 110
110 111
111 if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") 112 if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
112 execute_process( 113 execute_process(
113 COMMAND 114 COMMAND
114 ${PYTHON_EXECUTABLE} ${ORTHANC_FRAMEWORK_ROOT}/Resources/WindowsResources.py 115 ${PYTHON_EXECUTABLE} ${ORTHANC_FRAMEWORK_ROOT}/../Resources/WindowsResources.py
115 ${PLUGIN_VERSION} "Python plugin" OrthancPython.dll 116 ${PLUGIN_VERSION} "Python plugin" OrthancPython.dll
116 "Plugin to create Orthanc plugins using Python" 117 "Plugin to create Orthanc plugins using Python"
117 ERROR_VARIABLE Failure 118 ERROR_VARIABLE Failure
118 OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/Version.rc 119 OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/Version.rc
119 ) 120 )