# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1579945220 -3600
# Node ID d5cf43519a49777fbbd218c6386de4ebd9b2ea4a
# Parent  b53cab5bad849db825439db86dd92bc85d8f3572
fix lsb

diff -r b53cab5bad84 -r d5cf43519a49 CMakeLists.txt
--- a/CMakeLists.txt	Fri Jan 24 18:09:56 2020 +0100
+++ b/CMakeLists.txt	Sat Jan 25 10:40:20 2020 +0100
@@ -468,7 +468,7 @@
 if (ENABLE_PLUGINS AND BUILD_CONNECTIVITY_CHECKS)
   include(ExternalProject)
 
-  unset(Flags)
+  set(Flags)
   
   if (CMAKE_TOOLCHAIN_FILE)
     # Take absolute path to the toolchain
@@ -478,11 +478,13 @@
 
   if ("${CMAKE_SYSTEM_VERSION}" STREQUAL "LinuxStandardBase")
     list(APPEND Flags
-      -DLSB_CC=$ENV{LSB_CC}
-      -DLSB_CXX=$ENV{LSB_CXX}
+      -DLSB_CC=${CMAKE_LSB_CC}
+      -DLSB_CXX=${CMAKE_LSB_CXX}
       )
   endif()
 
+  message(${Flags})
+
   externalproject_add(ConnectivityChecksProject
     SOURCE_DIR "${ORTHANC_ROOT}/Plugins/Samples/ConnectivityChecks"
 
@@ -491,6 +493,7 @@
     -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}
     -DPLUGIN_VERSION=${ORTHANC_VERSION}
     -DSTATIC_BUILD=${STATIC_BUILD}
+    -DALLOW_DOWNLOADS=${ALLOW_DOWNLOADS}
     -DUSE_LEGACY_JSONCPP=${USE_LEGACY_JSONCPP}
     ${Flags}
     )
diff -r b53cab5bad84 -r d5cf43519a49 Resources/CMake/Compiler.cmake
--- a/Resources/CMake/Compiler.cmake	Fri Jan 24 18:09:56 2020 +0100
+++ b/Resources/CMake/Compiler.cmake	Sat Jan 25 10:40:20 2020 +0100
@@ -7,6 +7,15 @@
   SET(STANDALONE_BUILD ON)
 endif()
 
+
+if ("${CMAKE_SYSTEM_VERSION}" STREQUAL "LinuxStandardBase")
+  # Cache the environment variables "LSB_CC" and "LSB_CXX" for further
+  # use by "ExternalProject" in CMake
+  SET(CMAKE_LSB_CC $ENV{LSB_CC} CACHE STRING "")
+  SET(CMAKE_LSB_CXX $ENV{LSB_CXX} CACHE STRING "")
+endif()
+
+
 if (CMAKE_COMPILER_IS_GNUCXX)
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wno-long-long")