Mercurial > hg > orthanc-python
changeset 70:c10386bee2e3
fix link against system-wide orthanc framework
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Fri, 11 Jun 2021 14:54:26 +0200 |
| parents | 07fdf388c12e |
| children | 0fb9f2fb3157 38b0a6a1ca56 |
| files | CMakeLists.txt |
| diffstat | 1 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt Fri Jun 11 14:37:40 2021 +0200 +++ b/CMakeLists.txt Fri Jun 11 14:54:26 2021 +0200 @@ -7,7 +7,7 @@ set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline") set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg") else() - set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.8.2") + set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.9.3") set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web") endif() @@ -46,8 +46,12 @@ include_directories(${ORTHANC_FRAMEWORK_ROOT}) if (ORTHANC_FRAMEWORK_SOURCE STREQUAL "system") - #link_libraries(${ORTHANC_FRAMEWORK_LIBRARIES}) - + if (NOT ORTHANC_FRAMEWORK_ADDITIONAL_LIBRARIES STREQUAL "") + # https://stackoverflow.com/a/5272993/881731 + string(REPLACE " " ";" tmp ${ORTHANC_FRAMEWORK_ADDITIONAL_LIBRARIES}) + link_libraries(${tmp}) + endif() + else() include(${ORTHANC_FRAMEWORK_ROOT}/../Resources/CMake/OrthancFrameworkParameters.cmake)