Merge branch 'develop' of https://git.minres.com/TGFS/TGC-ISS into develop
This commit is contained in:
commit
061b21ed51
|
@ -89,7 +89,7 @@ if(CMAKE_PROJECT_NAME STREQUAL "TGC-ISS")
|
|||
lz4/1.9.3
|
||||
yaml-cpp/0.7.0
|
||||
jsoncpp/1.9.5
|
||||
zlib/1.2.13
|
||||
zlib/1.2.12
|
||||
)
|
||||
set(CONAN_PACKAGE_OPTIONS fmt:header_only=True ${CONAN_BOOST_OPTIONS})
|
||||
|
||||
|
@ -117,27 +117,27 @@ if(CMAKE_PROJECT_NAME STREQUAL "TGC-ISS")
|
|||
# Boost on CentOS 7 quirks: the b2 of conan-center is build against a newer libstdc++ and therefore does not run
|
||||
# with the oooooold libs on CentOS 7. Therefore we build our own version of b2 if it is not there
|
||||
###########################################################################
|
||||
set(B2_META $ENV{HOME}/.conan/data/b2/${B2_VERSION}/_/_/metadata.json)
|
||||
set(CM_META $ENV{HOME}/.conan/data/cmake/${CM_VERSION}/_/_/metadata.json)
|
||||
set(LLVM_META $ENV{HOME}/.conan/data/llvm-core/${LLVM_VERSION}/_/_/metadata.json)
|
||||
if(DEFINED ENV{CONAN_USER_HOME})
|
||||
set(B2_META $ENV{CONAN_USER_HOME}/.conan/data/b2/${B2_VERSION}/_/_/metadata.json)
|
||||
set(CMAKE_META $ENV{CONAN_USER_HOME}/.conan/data/cmake/${CM_VERSION}/_/_/metadata.json)
|
||||
endif()
|
||||
if(NOT EXISTS ${CM_META})
|
||||
conan_configure(REQUIRES cmake/${CM_VERSION})
|
||||
conan_cmake_autodetect(settings BUILD_TYPE Release)
|
||||
conan_cmake_install(PATH_OR_REFERENCE . BUILD cmake SETTINGS ${settings})
|
||||
endif()
|
||||
find_program(LSB_RELEASE_EXEC lsb_release)
|
||||
if(NOT LSB_RELEASE_EXEC-NOTFOUND)
|
||||
execute_process(COMMAND "${LSB_RELEASE_EXEC}" --short --id OUTPUT_VARIABLE LSB_RELEASE_ID_SHORT OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
if(LSB_RELEASE_ID_SHORT MATCHES "CentOS")
|
||||
set(B2_META $ENV{HOME}/.conan/data/b2/${B2_VERSION}/_/_/metadata.json)
|
||||
set(CM_META $ENV{HOME}/.conan/data/cmake/${CM_VERSION}/_/_/metadata.json)
|
||||
set(LLVM_META $ENV{HOME}/.conan/data/llvm-core/${LLVM_VERSION}/_/_/metadata.json)
|
||||
if(DEFINED ENV{CONAN_USER_HOME})
|
||||
set(B2_META $ENV{CONAN_USER_HOME}/.conan/data/b2/${B2_VERSION}/_/_/metadata.json)
|
||||
set(CMAKE_META $ENV{CONAN_USER_HOME}/.conan/data/cmake/${CM_VERSION}/_/_/metadata.json)
|
||||
endif()
|
||||
if(LSB_RELEASE_ID_SHORT MATCHES "CentOS")
|
||||
if(NOT EXISTS ${B2_META})
|
||||
conan_configure(REQUIRES b2/${B2_VERSION})
|
||||
conan_cmake_autodetect(settings BUILD_TYPE Release)
|
||||
conan_cmake_install(PATH_OR_REFERENCE . BUILD b2 SETTINGS ${settings})
|
||||
endif()
|
||||
if(NOT EXISTS ${CM_META})
|
||||
conan_configure(REQUIRES cmake/${CM_VERSION})
|
||||
conan_cmake_autodetect(settings BUILD_TYPE Release)
|
||||
conan_cmake_install(PATH_OR_REFERENCE . BUILD cmake SETTINGS ${settings})
|
||||
endif()
|
||||
if(NOT EXISTS ${LLVM_META})
|
||||
conan_configure(REQUIRES llvm-core/13.0.0)
|
||||
conan_cmake_autodetect(settings BUILD_TYPE Release)
|
||||
|
|
Loading…
Reference in New Issue