Mercurial > hg > orthanc

comparison CMakeLists.txt @ 4031:e3b3af80732d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ServerResources, and moving EmbeddedResourceHttpHandler from Core to OrthancServer
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 09 Jun 2020 21:31:13 +0200
parents 100fbe970762
children 058b5ade8acd
comparison
equal deleted inserted replaced
4030:100fbe970762 4031:e3b3af80732d
63 OrthancServer/Database/Compatibility/SetOfResources.cpp 63 OrthancServer/Database/Compatibility/SetOfResources.cpp
64 OrthancServer/Database/ResourcesContent.cpp 64 OrthancServer/Database/ResourcesContent.cpp
65 OrthancServer/Database/SQLiteDatabaseWrapper.cpp 65 OrthancServer/Database/SQLiteDatabaseWrapper.cpp
66 OrthancServer/DicomInstanceOrigin.cpp 66 OrthancServer/DicomInstanceOrigin.cpp
67 OrthancServer/DicomInstanceToStore.cpp 67 OrthancServer/DicomInstanceToStore.cpp
68 OrthancServer/EmbeddedResourceHttpHandler.cpp
68 OrthancServer/ExportedResource.cpp 69 OrthancServer/ExportedResource.cpp
69 OrthancServer/LuaScripting.cpp 70 OrthancServer/LuaScripting.cpp
70 OrthancServer/OrthancConfiguration.cpp 71 OrthancServer/OrthancConfiguration.cpp
71 OrthancServer/OrthancFindRequestHandler.cpp 72 OrthancServer/OrthancFindRequestHandler.cpp
73 OrthancServer/OrthancGetRequestHandler.cpp
72 OrthancServer/OrthancHttpHandler.cpp 74 OrthancServer/OrthancHttpHandler.cpp
73 OrthancServer/OrthancInitialization.cpp 75 OrthancServer/OrthancInitialization.cpp
74 OrthancServer/OrthancMoveRequestHandler.cpp 76 OrthancServer/OrthancMoveRequestHandler.cpp
75 OrthancServer/OrthancGetRequestHandler.cpp
76 OrthancServer/OrthancRestApi/OrthancRestAnonymizeModify.cpp 77 OrthancServer/OrthancRestApi/OrthancRestAnonymizeModify.cpp
77 OrthancServer/OrthancRestApi/OrthancRestApi.cpp 78 OrthancServer/OrthancRestApi/OrthancRestApi.cpp
78 OrthancServer/OrthancRestApi/OrthancRestArchive.cpp 79 OrthancServer/OrthancRestApi/OrthancRestArchive.cpp
79 OrthancServer/OrthancRestApi/OrthancRestChanges.cpp 80 OrthancServer/OrthancRestApi/OrthancRestChanges.cpp
80 OrthancServer/OrthancRestApi/OrthancRestModalities.cpp 81 OrthancServer/OrthancRestApi/OrthancRestModalities.cpp
163 set(ORTHANC_ALL_SOURCES 164 set(ORTHANC_ALL_SOURCES
164 ${ORTHANC_CORE_SOURCES_INTERNAL} 165 ${ORTHANC_CORE_SOURCES_INTERNAL}
165 ${ORTHANC_DICOM_SOURCES_INTERNAL} 166 ${ORTHANC_DICOM_SOURCES_INTERNAL}
166 ${ORTHANC_SERVER_SOURCES} 167 ${ORTHANC_SERVER_SOURCES}
167 ${ORTHANC_UNIT_TESTS_SOURCES} 168 ${ORTHANC_UNIT_TESTS_SOURCES}
169 ${ORTHANC_ROOT}/Core/HttpServer/EmbeddedResourceHttpHandler.cpp
168 Plugins/Samples/ServeFolders/Plugin.cpp 170 Plugins/Samples/ServeFolders/Plugin.cpp
169 Plugins/Samples/ModalityWorklists/Plugin.cpp 171 Plugins/Samples/ModalityWorklists/Plugin.cpp
170 OrthancServer/main.cpp 172 OrthancServer/main.cpp
171 ) 173 )
172 174
194 ) 196 )
195 197
196 if (STANDALONE_BUILD) 198 if (STANDALONE_BUILD)
197 # We embed all the resources in the binaries for standalone builds 199 # We embed all the resources in the binaries for standalone builds
198 add_definitions( 200 add_definitions(
199 -DORTHANC_HAS_EMBEDDED_RESOURCES=1
200 -DORTHANC_STANDALONE=1 201 -DORTHANC_STANDALONE=1
201 ) 202 )
202 EmbedResources( 203
203 --target=OrthancEmbeddedResources 204 list(APPEND ORTHANC_EMBEDDED_FILES
204 ${ORTHANC_EMBEDDED_FILES}
205 ORTHANC_EXPLORER ${CMAKE_CURRENT_SOURCE_DIR}/OrthancExplorer 205 ORTHANC_EXPLORER ${CMAKE_CURRENT_SOURCE_DIR}/OrthancExplorer
206 ${DCMTK_DICTIONARIES}
207 ${LIBICU_RESOURCES}
208 ) 206 )
209 else() 207 else()
210 add_definitions( 208 add_definitions(
211 -DORTHANC_HAS_EMBEDDED_RESOURCES=1
212 -DORTHANC_PATH=\"${CMAKE_SOURCE_DIR}\" 209 -DORTHANC_PATH=\"${CMAKE_SOURCE_DIR}\"
213 -DORTHANC_STANDALONE=0 210 -DORTHANC_STANDALONE=0
214 ) 211 )
215 EmbedResources( 212 endif()
216 --target=OrthancEmbeddedResources 213
217 ${ORTHANC_EMBEDDED_FILES} 214 EmbedResources(
218 ${LIBICU_RESOURCES} 215 --namespace=Orthanc.ServerResources
219 ) 216 --target=ServerResources
220 endif() 217 ${ORTHANC_EMBEDDED_FILES}
218 )
219
221 220
222 if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") 221 if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
223 execute_process( 222 execute_process(
224 COMMAND 223 COMMAND
225 ${PYTHON_EXECUTABLE} ${ORTHANC_ROOT}/Resources/WindowsResources.py 224 ${PYTHON_EXECUTABLE} ${ORTHANC_ROOT}/Resources/WindowsResources.py