Mercurial > hg > orthanc

comparison CMakeLists.txt @ 3625:d5cf43519a49

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix lsb
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sat, 25 Jan 2020 10:40:20 +0100
parents b53cab5bad84
children 02a4eaa76a25
comparison
equal deleted inserted replaced
3624:b53cab5bad84 3625:d5cf43519a49
466 ##################################################################### 466 #####################################################################
467 467
468 if (ENABLE_PLUGINS AND BUILD_CONNECTIVITY_CHECKS) 468 if (ENABLE_PLUGINS AND BUILD_CONNECTIVITY_CHECKS)
469 include(ExternalProject) 469 include(ExternalProject)
470 470
471 unset(Flags) 471 set(Flags)
472 472
473 if (CMAKE_TOOLCHAIN_FILE) 473 if (CMAKE_TOOLCHAIN_FILE)
474 # Take absolute path to the toolchain 474 # Take absolute path to the toolchain
475 get_filename_component(TMP ${CMAKE_TOOLCHAIN_FILE} REALPATH BASE ${CMAKE_SOURCE_DIR}) 475 get_filename_component(TMP ${CMAKE_TOOLCHAIN_FILE} REALPATH BASE ${CMAKE_SOURCE_DIR})
476 list(APPEND Flags -DCMAKE_TOOLCHAIN_FILE=${TMP}) 476 list(APPEND Flags -DCMAKE_TOOLCHAIN_FILE=${TMP})
477 endif() 477 endif()
478 478
479 if ("${CMAKE_SYSTEM_VERSION}" STREQUAL "LinuxStandardBase") 479 if ("${CMAKE_SYSTEM_VERSION}" STREQUAL "LinuxStandardBase")
480 list(APPEND Flags 480 list(APPEND Flags
481 -DLSB_CC=$ENV{LSB_CC} 481 -DLSB_CC=${CMAKE_LSB_CC}
482 -DLSB_CXX=$ENV{LSB_CXX} 482 -DLSB_CXX=${CMAKE_LSB_CXX}
483 ) 483 )
484 endif() 484 endif()
485
486 message(${Flags})
485 487
486 externalproject_add(ConnectivityChecksProject 488 externalproject_add(ConnectivityChecksProject
487 SOURCE_DIR "${ORTHANC_ROOT}/Plugins/Samples/ConnectivityChecks" 489 SOURCE_DIR "${ORTHANC_ROOT}/Plugins/Samples/ConnectivityChecks"
488 490
489 CMAKE_ARGS 491 CMAKE_ARGS
490 -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} 492 -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
491 -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR} 493 -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}
492 -DPLUGIN_VERSION=${ORTHANC_VERSION} 494 -DPLUGIN_VERSION=${ORTHANC_VERSION}
493 -DSTATIC_BUILD=${STATIC_BUILD} 495 -DSTATIC_BUILD=${STATIC_BUILD}
496 -DALLOW_DOWNLOADS=${ALLOW_DOWNLOADS}
494 -DUSE_LEGACY_JSONCPP=${USE_LEGACY_JSONCPP} 497 -DUSE_LEGACY_JSONCPP=${USE_LEGACY_JSONCPP}
495 ${Flags} 498 ${Flags}
496 ) 499 )
497 500
498 if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") 501 if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")