Mercurial > hg > orthanc
diff Resources/CMake/OrthancFrameworkConfiguration.cmake @ 2450:ade8b4ddd8a6
Static linking against libuuid
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 03 Jan 2018 11:02:59 +0100 |
parents | d9e3781d2023 |
children | c50413a4092c |
line wrap: on
line diff
--- a/Resources/CMake/OrthancFrameworkConfiguration.cmake Wed Jan 03 08:41:14 2018 +0100 +++ b/Resources/CMake/OrthancFrameworkConfiguration.cmake Wed Jan 03 11:02:59 2018 +0100 @@ -15,12 +15,17 @@ set(ORTHANC_ROOT ${CMAKE_CURRENT_LIST_DIR}/../..) # Some basic inclusions -include(CheckIncludeFiles) -include(CheckIncludeFileCXX) +include(CMakePushCheckState) include(CheckFunctionExists) +include(CheckIncludeFile) +include(CheckIncludeFileCXX) +include(CheckIncludeFiles) include(CheckLibraryExists) +include(CheckStructHasMember) +include(CheckSymbolExists) +include(CheckTypeSize) include(FindPythonInterp) - + include(${CMAKE_CURRENT_LIST_DIR}/AutoGeneratedCode.cmake) include(${CMAKE_CURRENT_LIST_DIR}/DownloadPackage.cmake) include(${CMAKE_CURRENT_LIST_DIR}/Compiler.cmake) @@ -328,6 +333,7 @@ ##################################################################### include(${CMAKE_CURRENT_LIST_DIR}/JsonCppConfiguration.cmake) +include(${CMAKE_CURRENT_LIST_DIR}/UuidConfiguration.cmake) include(${CMAKE_CURRENT_LIST_DIR}/ZlibConfiguration.cmake) # We put Boost as the last dependency, as it is the heaviest to @@ -473,6 +479,7 @@ ${BOOST_SOURCES} ${CIVETWEB_SOURCES} ${CURL_SOURCES} + ${E2FSPROGS_SOURCES} ${JSONCPP_SOURCES} ${LIBICONV_SOURCES} ${LIBJPEG_SOURCES}