Mercurial > hg > orthanc

comparison CMakeLists.txt @ 4045:05b8fd21089c framework

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix path
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 10 Jun 2020 21:27:31 +0200
parents 78ee0155ec67
children 7ff1e6c80627
comparison
equal deleted inserted replaced
4044:d25f4c0fa160 4045:05b8fd21089c
5 5
6 ##################################################################### 6 #####################################################################
7 ## Generic parameters of the Orthanc framework 7 ## Generic parameters of the Orthanc framework
8 ##################################################################### 8 #####################################################################
9 9
10 include(${CMAKE_SOURCE_DIR}/Resources/CMake/OrthancFrameworkParameters.cmake) 10 include(${CMAKE_SOURCE_DIR}/OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake)
11 11
12 # Enable all the optional components of the Orthanc framework 12 # Enable all the optional components of the Orthanc framework
13 set(ENABLE_CRYPTO_OPTIONS ON) 13 set(ENABLE_CRYPTO_OPTIONS ON)
14 set(ENABLE_DCMTK ON) 14 set(ENABLE_DCMTK ON)
15 set(ENABLE_DCMTK_NETWORKING ON) 15 set(ENABLE_DCMTK_NETWORKING ON)
44 44
45 ##################################################################### 45 #####################################################################
46 ## Configuration of the Orthanc framework 46 ## Configuration of the Orthanc framework
47 ##################################################################### 47 #####################################################################
48 48
49 include(${CMAKE_SOURCE_DIR}/Resources/CMake/VisualStudioPrecompiledHeaders.cmake) 49 include(${CMAKE_SOURCE_DIR}/OrthancFramework/Resources/CMake/VisualStudioPrecompiledHeaders.cmake)
50 include(${CMAKE_SOURCE_DIR}/Resources/CMake/OrthancFrameworkConfiguration.cmake) 50 include(${CMAKE_SOURCE_DIR}/OrthancFramework/Resources/CMake/OrthancFrameworkConfiguration.cmake)
51 51
52 52
53 ##################################################################### 53 #####################################################################
54 ## List of source files 54 ## List of source files
55 ##################################################################### 55 #####################################################################
56 56
57 set(ORTHANC_SERVER_SOURCES 57 set(ORTHANC_SERVER_SOURCES
58 OrthancServer/Database/Compatibility/DatabaseLookup.cpp 58 OrthancServer/Sources/Database/Compatibility/DatabaseLookup.cpp
59 OrthancServer/Database/Compatibility/ICreateInstance.cpp 59 OrthancServer/Sources/Database/Compatibility/ICreateInstance.cpp
60 OrthancServer/Database/Compatibility/IGetChildrenMetadata.cpp 60 OrthancServer/Sources/Database/Compatibility/IGetChildrenMetadata.cpp
61 OrthancServer/Database/Compatibility/ILookupResourceAndParent.cpp 61 OrthancServer/Sources/Database/Compatibility/ILookupResourceAndParent.cpp
62 OrthancServer/Database/Compatibility/ILookupResources.cpp 62 OrthancServer/Sources/Database/Compatibility/ILookupResources.cpp
63 OrthancServer/Database/Compatibility/SetOfResources.cpp 63 OrthancServer/Sources/Database/Compatibility/SetOfResources.cpp
64 OrthancServer/Database/ResourcesContent.cpp 64 OrthancServer/Sources/Database/ResourcesContent.cpp
65 OrthancServer/Database/SQLiteDatabaseWrapper.cpp 65 OrthancServer/Sources/Database/SQLiteDatabaseWrapper.cpp
66 OrthancServer/DicomInstanceOrigin.cpp 66 OrthancServer/Sources/DicomInstanceOrigin.cpp
67 OrthancServer/DicomInstanceToStore.cpp 67 OrthancServer/Sources/DicomInstanceToStore.cpp
68 OrthancServer/EmbeddedResourceHttpHandler.cpp 68 OrthancServer/Sources/EmbeddedResourceHttpHandler.cpp
69 OrthancServer/ExportedResource.cpp 69 OrthancServer/Sources/ExportedResource.cpp
70 OrthancServer/LuaScripting.cpp 70 OrthancServer/Sources/LuaScripting.cpp
71 OrthancServer/OrthancConfiguration.cpp 71 OrthancServer/Sources/OrthancConfiguration.cpp
72 OrthancServer/OrthancFindRequestHandler.cpp 72 OrthancServer/Sources/OrthancFindRequestHandler.cpp
73 OrthancServer/OrthancGetRequestHandler.cpp 73 OrthancServer/Sources/OrthancGetRequestHandler.cpp
74 OrthancServer/OrthancHttpHandler.cpp 74 OrthancServer/Sources/OrthancHttpHandler.cpp
75 OrthancServer/OrthancInitialization.cpp 75 OrthancServer/Sources/OrthancInitialization.cpp
76 OrthancServer/OrthancMoveRequestHandler.cpp 76 OrthancServer/Sources/OrthancMoveRequestHandler.cpp
77 OrthancServer/OrthancRestApi/OrthancRestAnonymizeModify.cpp 77 OrthancServer/Sources/OrthancRestApi/OrthancRestAnonymizeModify.cpp
78 OrthancServer/OrthancRestApi/OrthancRestApi.cpp 78 OrthancServer/Sources/OrthancRestApi/OrthancRestApi.cpp
79 OrthancServer/OrthancRestApi/OrthancRestArchive.cpp 79 OrthancServer/Sources/OrthancRestApi/OrthancRestArchive.cpp
80 OrthancServer/OrthancRestApi/OrthancRestChanges.cpp 80 OrthancServer/Sources/OrthancRestApi/OrthancRestChanges.cpp
81 OrthancServer/OrthancRestApi/OrthancRestModalities.cpp 81 OrthancServer/Sources/OrthancRestApi/OrthancRestModalities.cpp
82 OrthancServer/OrthancRestApi/OrthancRestResources.cpp 82 OrthancServer/Sources/OrthancRestApi/OrthancRestResources.cpp
83 OrthancServer/OrthancRestApi/OrthancRestSystem.cpp 83 OrthancServer/Sources/OrthancRestApi/OrthancRestSystem.cpp
84 OrthancServer/QueryRetrieveHandler.cpp 84 OrthancServer/Sources/QueryRetrieveHandler.cpp
85 OrthancServer/Search/DatabaseConstraint.cpp 85 OrthancServer/Sources/Search/DatabaseConstraint.cpp
86 OrthancServer/Search/DatabaseLookup.cpp 86 OrthancServer/Sources/Search/DatabaseLookup.cpp
87 OrthancServer/Search/DicomTagConstraint.cpp 87 OrthancServer/Sources/Search/DicomTagConstraint.cpp
88 OrthancServer/Search/HierarchicalMatcher.cpp 88 OrthancServer/Sources/Search/HierarchicalMatcher.cpp
89 OrthancServer/Search/ISqlLookupFormatter.cpp 89 OrthancServer/Sources/Search/ISqlLookupFormatter.cpp
90 OrthancServer/ServerContext.cpp 90 OrthancServer/Sources/ServerContext.cpp
91 OrthancServer/ServerEnumerations.cpp 91 OrthancServer/Sources/ServerEnumerations.cpp
92 OrthancServer/ServerIndex.cpp 92 OrthancServer/Sources/ServerIndex.cpp
93 OrthancServer/ServerJobs/ArchiveJob.cpp 93 OrthancServer/Sources/ServerJobs/ArchiveJob.cpp
94 OrthancServer/ServerJobs/CleaningInstancesJob.cpp 94 OrthancServer/Sources/ServerJobs/CleaningInstancesJob.cpp
95 OrthancServer/ServerJobs/DicomModalityStoreJob.cpp 95 OrthancServer/Sources/ServerJobs/DicomModalityStoreJob.cpp
96 OrthancServer/ServerJobs/DicomMoveScuJob.cpp 96 OrthancServer/Sources/ServerJobs/DicomMoveScuJob.cpp
97 OrthancServer/ServerJobs/LuaJobManager.cpp 97 OrthancServer/Sources/ServerJobs/LuaJobManager.cpp
98 OrthancServer/ServerJobs/MergeStudyJob.cpp 98 OrthancServer/Sources/ServerJobs/MergeStudyJob.cpp
99 OrthancServer/ServerJobs/Operations/DeleteResourceOperation.cpp 99 OrthancServer/Sources/ServerJobs/Operations/DeleteResourceOperation.cpp
100 OrthancServer/ServerJobs/Operations/DicomInstanceOperationValue.cpp 100 OrthancServer/Sources/ServerJobs/Operations/DicomInstanceOperationValue.cpp
101 OrthancServer/ServerJobs/Operations/ModifyInstanceOperation.cpp 101 OrthancServer/Sources/ServerJobs/Operations/ModifyInstanceOperation.cpp
102 OrthancServer/ServerJobs/Operations/StorePeerOperation.cpp 102 OrthancServer/Sources/ServerJobs/Operations/StorePeerOperation.cpp
103 OrthancServer/ServerJobs/Operations/StoreScuOperation.cpp 103 OrthancServer/Sources/ServerJobs/Operations/StoreScuOperation.cpp
104 OrthancServer/ServerJobs/Operations/SystemCallOperation.cpp 104 OrthancServer/Sources/ServerJobs/Operations/SystemCallOperation.cpp
105 OrthancServer/ServerJobs/OrthancJobUnserializer.cpp 105 OrthancServer/Sources/ServerJobs/OrthancJobUnserializer.cpp
106 OrthancServer/ServerJobs/OrthancPeerStoreJob.cpp 106 OrthancServer/Sources/ServerJobs/OrthancPeerStoreJob.cpp
107 OrthancServer/ServerJobs/ResourceModificationJob.cpp 107 OrthancServer/Sources/ServerJobs/ResourceModificationJob.cpp
108 OrthancServer/ServerJobs/SplitStudyJob.cpp 108 OrthancServer/Sources/ServerJobs/SplitStudyJob.cpp
109 OrthancServer/ServerJobs/StorageCommitmentScpJob.cpp 109 OrthancServer/Sources/ServerJobs/StorageCommitmentScpJob.cpp
110 OrthancServer/ServerToolbox.cpp 110 OrthancServer/Sources/ServerToolbox.cpp
111 OrthancServer/SliceOrdering.cpp 111 OrthancServer/Sources/SliceOrdering.cpp
112 OrthancServer/StorageCommitmentReports.cpp 112 OrthancServer/Sources/StorageCommitmentReports.cpp
113 ) 113 )
114 114
115 115
116 set(ORTHANC_UNIT_TESTS_SOURCES 116 set(ORTHANC_FRAMEWORK_UNIT_TESTS
117 UnitTestsSources/DatabaseLookupTests.cpp 117 OrthancFramework/UnitTestsSources/FrameworkTests.cpp
118 UnitTestsSources/DicomMapTests.cpp 118 OrthancFramework/UnitTestsSources/ImageProcessingTests.cpp
119 UnitTestsSources/FileStorageTests.cpp 119 OrthancFramework/UnitTestsSources/JpegLosslessTests.cpp
120 UnitTestsSources/FrameworkTests.cpp 120 OrthancFramework/UnitTestsSources/LoggingTests.cpp
121 UnitTestsSources/FromDcmtkTests.cpp 121 OrthancFramework/UnitTestsSources/RestApiTests.cpp
122 UnitTestsSources/ImageProcessingTests.cpp 122 OrthancFramework/UnitTestsSources/SQLiteChromiumTests.cpp
123 UnitTestsSources/ImageTests.cpp 123 OrthancFramework/UnitTestsSources/SQLiteTests.cpp
124 UnitTestsSources/JpegLosslessTests.cpp 124 OrthancFramework/UnitTestsSources/StreamTests.cpp
125 UnitTestsSources/LoggingTests.cpp 125 OrthancFramework/UnitTestsSources/ToolboxTests.cpp
126 UnitTestsSources/LuaTests.cpp 126 OrthancFramework/UnitTestsSources/ZipTests.cpp
127 UnitTestsSources/MemoryCacheTests.cpp 127 )
128 UnitTestsSources/MultiThreadingTests.cpp 128
129 UnitTestsSources/RestApiTests.cpp 129 set(ORTHANC_SERVER_UNIT_TESTS
130 UnitTestsSources/SQLiteChromiumTests.cpp 130 OrthancServer/UnitTestsSources/DatabaseLookupTests.cpp
131 UnitTestsSources/SQLiteTests.cpp 131 OrthancServer/UnitTestsSources/DicomMapTests.cpp
132 UnitTestsSources/ServerIndexTests.cpp 132 OrthancServer/UnitTestsSources/FileStorageTests.cpp
133 UnitTestsSources/StreamTests.cpp 133 OrthancServer/UnitTestsSources/FromDcmtkTests.cpp
134 UnitTestsSources/ToolboxTests.cpp 134 OrthancServer/UnitTestsSources/ImageTests.cpp
135 UnitTestsSources/UnitTestsMain.cpp 135 OrthancServer/UnitTestsSources/LuaTests.cpp
136 UnitTestsSources/VersionsTests.cpp 136 OrthancServer/UnitTestsSources/MemoryCacheTests.cpp
137 UnitTestsSources/ZipTests.cpp 137 OrthancServer/UnitTestsSources/MultiThreadingTests.cpp
138 OrthancServer/UnitTestsSources/ServerIndexTests.cpp
139 OrthancServer/UnitTestsSources/UnitTestsMain.cpp
140 OrthancServer/UnitTestsSources/VersionsTests.cpp
138 ) 141 )
139 142
140 143
141 if (ENABLE_PLUGINS) 144 if (ENABLE_PLUGINS)
142 include_directories(${CMAKE_SOURCE_DIR}/Plugins/Include) 145 include_directories(${CMAKE_SOURCE_DIR}/OrthancServer/Plugins/Include)
143 146
144 list(APPEND ORTHANC_SERVER_SOURCES 147 list(APPEND ORTHANC_SERVER_SOURCES
145 Plugins/Engine/OrthancPluginDatabase.cpp 148 OrthancServer/Plugins/Engine/OrthancPluginDatabase.cpp
146 Plugins/Engine/OrthancPlugins.cpp 149 OrthancServer/Plugins/Engine/OrthancPlugins.cpp
147 Plugins/Engine/PluginsEnumerations.cpp 150 OrthancServer/Plugins/Engine/PluginsEnumerations.cpp
148 Plugins/Engine/PluginsErrorDictionary.cpp 151 OrthancServer/Plugins/Engine/PluginsErrorDictionary.cpp
149 Plugins/Engine/PluginsJob.cpp 152 OrthancServer/Plugins/Engine/PluginsJob.cpp
150 Plugins/Engine/PluginsManager.cpp 153 OrthancServer/Plugins/Engine/PluginsManager.cpp
151 ) 154 )
152 155
153 list(APPEND ORTHANC_UNIT_TESTS_SOURCES 156 list(APPEND ORTHANC_SERVER_UNIT_TESTS
154 UnitTestsSources/PluginsTests.cpp 157 OrthancServer/UnitTestsSources/PluginsTests.cpp
155 ) 158 )
156 endif() 159 endif()
157 160
158 161
159 if (CMAKE_COMPILER_IS_GNUCXX 162 if (CMAKE_COMPILER_IS_GNUCXX
163 # cross-compiling DCMTK 3.6.0 166 # cross-compiling DCMTK 3.6.0
164 set(ORTHANC_ALL_SOURCES 167 set(ORTHANC_ALL_SOURCES
165 ${ORTHANC_CORE_SOURCES_INTERNAL} 168 ${ORTHANC_CORE_SOURCES_INTERNAL}
166 ${ORTHANC_DICOM_SOURCES_INTERNAL} 169 ${ORTHANC_DICOM_SOURCES_INTERNAL}
167 ${ORTHANC_SERVER_SOURCES} 170 ${ORTHANC_SERVER_SOURCES}
168 ${ORTHANC_UNIT_TESTS_SOURCES} 171 ${ORTHANC_FRAMEWORK_UNIT_TESTS}
169 ${ORTHANC_ROOT}/Core/HttpServer/EmbeddedResourceHttpHandler.cpp 172 ${ORTHANC_SERVER_UNIT_TESTS}
170 Plugins/Samples/ServeFolders/Plugin.cpp 173 ${ORTHANC_ROOT}/OrthancServer/Plugins/Samples/ModalityWorklists/Plugin.cpp
171 Plugins/Samples/ModalityWorklists/Plugin.cpp 174 ${ORTHANC_ROOT}/OrthancServer/Plugins/Samples/ServeFolders/Plugin.cpp
172 OrthancServer/main.cpp 175 ${ORTHANC_ROOT}/OrthancServer/Sources/EmbeddedResourceHttpHandler.cpp
176 ${ORTHANC_ROOT}/OrthancServer/Sources/main.cpp
173 ) 177 )
174 178
175 set_source_files_properties(${ORTHANC_ALL_SOURCES} 179 set_source_files_properties(${ORTHANC_ALL_SOURCES}
176 PROPERTIES COMPILE_FLAGS -pedantic 180 PROPERTIES COMPILE_FLAGS -pedantic
177 ) 181 )
181 ##################################################################### 185 #####################################################################
182 ## Autogeneration of files 186 ## Autogeneration of files
183 ##################################################################### 187 #####################################################################
184 188
185 set(ORTHANC_EMBEDDED_FILES 189 set(ORTHANC_EMBEDDED_FILES
186 CONFIGURATION_SAMPLE ${CMAKE_CURRENT_SOURCE_DIR}/Resources/Configuration.json 190 CONFIGURATION_SAMPLE ${CMAKE_CURRENT_SOURCE_DIR}/OrthancServer/Resources/Configuration.json
187 DICOM_CONFORMANCE_STATEMENT ${CMAKE_CURRENT_SOURCE_DIR}/Resources/DicomConformanceStatement.txt 191 DICOM_CONFORMANCE_STATEMENT ${CMAKE_CURRENT_SOURCE_DIR}/OrthancServer/Resources/DicomConformanceStatement.txt
188 FONT_UBUNTU_MONO_BOLD_16 ${CMAKE_CURRENT_SOURCE_DIR}/Resources/Fonts/UbuntuMonoBold-16.json 192 FONT_UBUNTU_MONO_BOLD_16 ${CMAKE_CURRENT_SOURCE_DIR}/OrthancFramework/Resources/Fonts/UbuntuMonoBold-16.json
189 LUA_TOOLBOX ${CMAKE_CURRENT_SOURCE_DIR}/Resources/Toolbox.lua 193 LUA_TOOLBOX ${CMAKE_CURRENT_SOURCE_DIR}/OrthancServer/Resources/Toolbox.lua
190 PREPARE_DATABASE ${CMAKE_CURRENT_SOURCE_DIR}/OrthancServer/Database/PrepareDatabase.sql 194 PREPARE_DATABASE ${CMAKE_CURRENT_SOURCE_DIR}/OrthancServer/Sources/Database/PrepareDatabase.sql
191 UPGRADE_DATABASE_3_TO_4 ${CMAKE_CURRENT_SOURCE_DIR}/OrthancServer/Database/Upgrade3To4.sql 195 UPGRADE_DATABASE_3_TO_4 ${CMAKE_CURRENT_SOURCE_DIR}/OrthancServer/Sources/Database/Upgrade3To4.sql
192 UPGRADE_DATABASE_4_TO_5 ${CMAKE_CURRENT_SOURCE_DIR}/OrthancServer/Database/Upgrade4To5.sql 196 UPGRADE_DATABASE_4_TO_5 ${CMAKE_CURRENT_SOURCE_DIR}/OrthancServer/Sources/Database/Upgrade4To5.sql
193 197
194 INSTALL_TRACK_ATTACHMENTS_SIZE 198 INSTALL_TRACK_ATTACHMENTS_SIZE
195 ${CMAKE_CURRENT_SOURCE_DIR}/OrthancServer/Database/InstallTrackAttachmentsSize.sql 199 ${CMAKE_CURRENT_SOURCE_DIR}/OrthancServer/Sources/Database/InstallTrackAttachmentsSize.sql
196 ) 200 )
197 201
198 if (STANDALONE_BUILD) 202 if (STANDALONE_BUILD)
199 # We embed all the resources in the binaries for standalone builds 203 # We embed all the resources in the binaries for standalone builds
200 add_definitions( 204 add_definitions(
201 -DORTHANC_STANDALONE=1 205 -DORTHANC_STANDALONE=1
202 ) 206 )
203 207
204 list(APPEND ORTHANC_EMBEDDED_FILES 208 list(APPEND ORTHANC_EMBEDDED_FILES
205 ORTHANC_EXPLORER ${CMAKE_CURRENT_SOURCE_DIR}/OrthancExplorer 209 ORTHANC_EXPLORER ${CMAKE_CURRENT_SOURCE_DIR}/OrthancServer/OrthancExplorer
206 ) 210 )
207 else() 211 else()
208 add_definitions( 212 add_definitions(
209 -DORTHANC_PATH=\"${CMAKE_SOURCE_DIR}\" 213 -DORTHANC_PATH=\"${CMAKE_SOURCE_DIR}\"
210 -DORTHANC_STANDALONE=0 214 -DORTHANC_STANDALONE=0
212 endif() 216 endif()
213 217
214 EmbedResources( 218 EmbedResources(
215 --namespace=Orthanc.ServerResources 219 --namespace=Orthanc.ServerResources
216 --target=OrthancServerResources 220 --target=OrthancServerResources
217 --framework-path=${CMAKE_SOURCE_DIR}/Core 221 --framework-path=${CMAKE_SOURCE_DIR}/OrthancFramework/Sources
218 ${ORTHANC_EMBEDDED_FILES} 222 ${ORTHANC_EMBEDDED_FILES}
219 ) 223 )
220 224
221 225
222 if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") 226 if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
282 ADD_VISUAL_STUDIO_PRECOMPILED_HEADERS( 286 ADD_VISUAL_STUDIO_PRECOMPILED_HEADERS(
283 "PrecompiledHeaders.h" "Core/PrecompiledHeaders.cpp" 287 "PrecompiledHeaders.h" "Core/PrecompiledHeaders.cpp"
284 TMP ORTHANC_CORE_PCH) 288 TMP ORTHANC_CORE_PCH)
285 289
286 ADD_VISUAL_STUDIO_PRECOMPILED_HEADERS( 290 ADD_VISUAL_STUDIO_PRECOMPILED_HEADERS(
287 "PrecompiledHeadersServer.h" "OrthancServer/PrecompiledHeadersServer.cpp" 291 "PrecompiledHeadersServer.h" "OrthancServer/Sources/PrecompiledHeadersServer.cpp"
288 ORTHANC_SERVER_SOURCES ORTHANC_SERVER_PCH) 292 ORTHANC_SERVER_SOURCES ORTHANC_SERVER_PCH)
289 293
290 ADD_VISUAL_STUDIO_PRECOMPILED_HEADERS( 294 ADD_VISUAL_STUDIO_PRECOMPILED_HEADERS(
291 "PrecompiledHeadersUnitTests.h" "UnitTestsSources/PrecompiledHeadersUnitTests.cpp" 295 "PrecompiledHeadersUnitTests.h" "UnitTestsSources/PrecompiledHeadersUnitTests.cpp"
292 ORTHANC_UNIT_TESTS_SOURCES ORTHANC_UNIT_TESTS_PCH) 296 ORTHANC_SERVER_UNIT_TESTS ORTHANC_UNIT_TESTS_PCH)
293 endif() 297 endif()
294 298
295 299
296 300
297 ##################################################################### 301 #####################################################################
325 329
326 # Ensure autogenerated code is built before building ServerLibrary 330 # Ensure autogenerated code is built before building ServerLibrary
327 add_dependencies(ServerLibrary CoreLibrary) 331 add_dependencies(ServerLibrary CoreLibrary)
328 332
329 add_executable(Orthanc 333 add_executable(Orthanc
330 OrthancServer/main.cpp 334 OrthancServer/Sources/main.cpp
331 ${ORTHANC_RESOURCES} 335 ${ORTHANC_RESOURCES}
332 ) 336 )
333 337
334 target_link_libraries(Orthanc ServerLibrary CoreLibrary ${DCMTK_LIBRARIES}) 338 target_link_libraries(Orthanc ServerLibrary CoreLibrary ${DCMTK_LIBRARIES})
335 339
344 ##################################################################### 348 #####################################################################
345 349
346 add_executable(UnitTests 350 add_executable(UnitTests
347 ${GOOGLE_TEST_SOURCES} 351 ${GOOGLE_TEST_SOURCES}
348 ${ORTHANC_UNIT_TESTS_PCH} 352 ${ORTHANC_UNIT_TESTS_PCH}
349 ${ORTHANC_UNIT_TESTS_SOURCES} 353 ${ORTHANC_FRAMEWORK_UNIT_TESTS}
354 ${ORTHANC_SERVER_UNIT_TESTS}
350 ${BOOST_EXTENDED_SOURCES} 355 ${BOOST_EXTENDED_SOURCES}
351 ) 356 )
352 357
353 target_link_libraries(UnitTests 358 target_link_libraries(UnitTests
354 ServerLibrary 359 ServerLibrary
367 add_library(ThirdPartyPlugins STATIC 372 add_library(ThirdPartyPlugins STATIC
368 ${BOOST_SOURCES} 373 ${BOOST_SOURCES}
369 ${JSONCPP_SOURCES} 374 ${JSONCPP_SOURCES}
370 ${LIBICONV_SOURCES} 375 ${LIBICONV_SOURCES}
371 ${LIBICU_SOURCES} 376 ${LIBICU_SOURCES}
372 Plugins/Samples/Common/OrthancPluginCppWrapper.cpp 377 OrthancServer/Plugins/Samples/Common/OrthancPluginCppWrapper.cpp
373 ) 378 )
374 379
375 if (LIBICU_LIBRARIES) 380 if (LIBICU_LIBRARIES)
376 target_link_libraries(ThirdPartyPlugins ${LIBICU_LIBRARIES}) 381 target_link_libraries(ThirdPartyPlugins ${LIBICU_LIBRARIES})
377 endif() 382 endif()
405 410
406 list(APPEND SERVE_FOLDERS_RESOURCES ${AUTOGENERATED_DIR}/ServeFolders.rc) 411 list(APPEND SERVE_FOLDERS_RESOURCES ${AUTOGENERATED_DIR}/ServeFolders.rc)
407 endif() 412 endif()
408 413
409 add_library(ServeFolders SHARED 414 add_library(ServeFolders SHARED
410 Plugins/Samples/ServeFolders/Plugin.cpp 415 ${ORTHANC_ROOT}/OrthancServer/Plugins/Samples/ServeFolders/Plugin.cpp
411 ${SERVE_FOLDERS_RESOURCES} 416 ${SERVE_FOLDERS_RESOURCES}
412 ) 417 )
413 418
414 target_link_libraries(ServeFolders ThirdPartyPlugins) 419 target_link_libraries(ServeFolders ThirdPartyPlugins)
415 420
448 453
449 list(APPEND MODALITY_WORKLISTS_RESOURCES ${AUTOGENERATED_DIR}/ModalityWorklists.rc) 454 list(APPEND MODALITY_WORKLISTS_RESOURCES ${AUTOGENERATED_DIR}/ModalityWorklists.rc)
450 endif() 455 endif()
451 456
452 add_library(ModalityWorklists SHARED 457 add_library(ModalityWorklists SHARED
453 Plugins/Samples/ModalityWorklists/Plugin.cpp 458 ${ORTHANC_ROOT}/OrthancServer/Plugins/Samples/ModalityWorklists/Plugin.cpp
454 ${MODALITY_WORKLISTS_RESOURCES} 459 ${MODALITY_WORKLISTS_RESOURCES}
455 ) 460 )
456 461
457 target_link_libraries(ModalityWorklists ThirdPartyPlugins) 462 target_link_libraries(ModalityWorklists ThirdPartyPlugins)
458 463
492 -DLSB_CXX=${CMAKE_LSB_CXX} 497 -DLSB_CXX=${CMAKE_LSB_CXX}
493 ) 498 )
494 endif() 499 endif()
495 500
496 externalproject_add(ConnectivityChecks 501 externalproject_add(ConnectivityChecks
497 SOURCE_DIR "${ORTHANC_ROOT}/Plugins/Samples/ConnectivityChecks" 502 SOURCE_DIR "${ORTHANC_ROOT}/OrthancServer/Plugins/Samples/ConnectivityChecks"
498 503
499 # We explicitly provide a build directory, in order to avoid paths 504 # We explicitly provide a build directory, in order to avoid paths
500 # that are too long on our Visual Studio 2008 CIS 505 # that are too long on our Visual Studio 2008 CIS
501 BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/ConnectivityChecks-build" 506 BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/ConnectivityChecks-build"
502 507
536 ## Build the companion tool to recover files compressed using Orthanc 541 ## Build the companion tool to recover files compressed using Orthanc
537 ##################################################################### 542 #####################################################################
538 543
539 if (BUILD_RECOVER_COMPRESSED_FILE) 544 if (BUILD_RECOVER_COMPRESSED_FILE)
540 set(RECOVER_COMPRESSED_SOURCES 545 set(RECOVER_COMPRESSED_SOURCES
541 Resources/Samples/Tools/RecoverCompressedFile.cpp 546 ${ORTHANC_ROOT}/OrthancServer/Resources/Samples/Tools/RecoverCompressedFile.cpp
542 ) 547 )
543 548
544 if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") 549 if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
545 execute_process( 550 execute_process(
546 COMMAND 551 COMMAND
577 ##################################################################### 582 #####################################################################
578 583
579 find_package(Doxygen) 584 find_package(Doxygen)
580 if (DOXYGEN_FOUND) 585 if (DOXYGEN_FOUND)
581 configure_file( 586 configure_file(
582 ${CMAKE_SOURCE_DIR}/Resources/Orthanc.doxygen 587 ${CMAKE_SOURCE_DIR}/OrthancServer/Resources/Orthanc.doxygen
583 ${CMAKE_CURRENT_BINARY_DIR}/Orthanc.doxygen 588 ${CMAKE_CURRENT_BINARY_DIR}/Orthanc.doxygen
584 @ONLY) 589 @ONLY)
585 590
586 configure_file( 591 configure_file(
587 ${CMAKE_SOURCE_DIR}/Resources/OrthancPlugin.doxygen 592 ${CMAKE_SOURCE_DIR}/OrthancServer/Resources/OrthancPlugin.doxygen
588 ${CMAKE_CURRENT_BINARY_DIR}/OrthancPlugin.doxygen 593 ${CMAKE_CURRENT_BINARY_DIR}/OrthancPlugin.doxygen
589 @ONLY) 594 @ONLY)
590 595
591 add_custom_target(doc 596 add_custom_target(doc
592 ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Orthanc.doxygen 597 ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Orthanc.doxygen
615 ##################################################################### 620 #####################################################################
616 621
617 if (ENABLE_PLUGINS) 622 if (ENABLE_PLUGINS)
618 install( 623 install(
619 FILES 624 FILES
620 Plugins/Include/orthanc/OrthancCPlugin.h 625 OrthancServer/Plugins/Include/orthanc/OrthancCPlugin.h
621 Plugins/Include/orthanc/OrthancCDatabasePlugin.h 626 OrthancServer/Plugins/Include/orthanc/OrthancCDatabasePlugin.h
622 DESTINATION include/orthanc 627 DESTINATION include/orthanc
623 ) 628 )
624 endif() 629 endif()
625 630
626 631
629 ## Prepare the "uninstall" target 634 ## Prepare the "uninstall" target
630 ## http://www.cmake.org/Wiki/CMake_FAQ#Can_I_do_.22make_uninstall.22_with_CMake.3F 635 ## http://www.cmake.org/Wiki/CMake_FAQ#Can_I_do_.22make_uninstall.22_with_CMake.3F
631 ##################################################################### 636 #####################################################################
632 637
633 configure_file( 638 configure_file(
634 "${CMAKE_CURRENT_SOURCE_DIR}/Resources/CMake/Uninstall.cmake.in" 639 "${CMAKE_CURRENT_SOURCE_DIR}/OrthancFramework/Resources/CMake/Uninstall.cmake.in"
635 "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" 640 "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
636 IMMEDIATE @ONLY) 641 IMMEDIATE @ONLY)
637 642
638 add_custom_target(uninstall 643 add_custom_target(uninstall
639 COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake) 644 COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)