Mercurial > hg > orthanc-webviewer
diff CMakeLists.txt @ 272:2c3555b8eabc
sync
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 01 Jul 2020 11:29:01 +0200 |
parents | 3e9307f6da67 |
children | 52b56343d268 |
line wrap: on
line diff
--- a/CMakeLists.txt Wed Jun 10 18:49:07 2020 +0200 +++ b/CMakeLists.txt Wed Jul 01 11:29:01 2020 +0200 @@ -53,7 +53,7 @@ ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD" OR ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD") set(ENABLE_PLUGINS_VERSION_SCRIPT OFF) - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--version-script=${CMAKE_SOURCE_DIR}/Resources/Orthanc/Plugins/VersionScript.map") + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--version-script=${CMAKE_SOURCE_DIR}/Resources/Orthanc/Plugins/VersionScriptPlugins.map") endif() @@ -68,7 +68,7 @@ link_libraries(OrthancFramework) else() include(${CMAKE_SOURCE_DIR}/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake) - include(${ORTHANC_ROOT}/Resources/CMake/OrthancFrameworkParameters.cmake) + include(${ORTHANC_FRAMEWORK_ROOT}/Resources/CMake/OrthancFrameworkParameters.cmake) set(ENABLE_LOCALE OFF) # Disable support for locales (notably in Boost) set(ENABLE_GOOGLE_TEST ON) @@ -77,8 +77,8 @@ set(ENABLE_MODULE_DICOM OFF CACHE INTERNAL "") set(HAS_EMBEDDED_RESOURCES ON) - include(${ORTHANC_ROOT}/Resources/CMake/OrthancFrameworkConfiguration.cmake) - include_directories(${ORTHANC_ROOT}/Core) + include(${ORTHANC_FRAMEWORK_ROOT}/Resources/CMake/OrthancFrameworkConfiguration.cmake) + include_directories(${ORTHANC_FRAMEWORK_ROOT}/Sources) endif() @@ -129,7 +129,7 @@ execute_process( COMMAND - ${PYTHON_EXECUTABLE} ${ORTHANC_ROOT}/Resources/WindowsResources.py + ${PYTHON_EXECUTABLE} ${ORTHANC_FRAMEWORK_ROOT}/Resources/WindowsResources.py ${ORTHANC_PLUGIN_VERSION} "OrthancWebViewer" OrthancWebViewer.dll "Web viewer of medical images for Orthanc" ERROR_VARIABLE Failure OUTPUT_FILE ${AUTOGENERATED_DIR}/Version.rc