Mercurial > hg > orthanc

comparison CMakeLists.txt @ 2366:26f3a346226f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
more consistent handling of libiconv in cmake
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 21 Aug 2017 21:21:48 +0200
parents 25a15aae0d74
children 2aff870c2c58
comparison
equal deleted inserted replaced
2365:9e0eae8a5ea4 2366:26f3a346226f
41 SET(USE_SYSTEM_SQLITE ON CACHE BOOL "Use the system version of SQLite") 41 SET(USE_SYSTEM_SQLITE ON CACHE BOOL "Use the system version of SQLite")
42 SET(USE_SYSTEM_MONGOOSE ON CACHE BOOL "Use the system version of Mongoose") 42 SET(USE_SYSTEM_MONGOOSE ON CACHE BOOL "Use the system version of Mongoose")
43 SET(USE_SYSTEM_LUA ON CACHE BOOL "Use the system version of Lua") 43 SET(USE_SYSTEM_LUA ON CACHE BOOL "Use the system version of Lua")
44 SET(USE_SYSTEM_DCMTK ON CACHE BOOL "Use the system version of DCMTK") 44 SET(USE_SYSTEM_DCMTK ON CACHE BOOL "Use the system version of DCMTK")
45 SET(USE_SYSTEM_BOOST ON CACHE BOOL "Use the system version of Boost") 45 SET(USE_SYSTEM_BOOST ON CACHE BOOL "Use the system version of Boost")
46 SET(USE_SYSTEM_LIBICONV ON CACHE BOOL "Use the system version of libiconv")
46 SET(USE_SYSTEM_LIBPNG ON CACHE BOOL "Use the system version of libpng") 47 SET(USE_SYSTEM_LIBPNG ON CACHE BOOL "Use the system version of libpng")
47 SET(USE_SYSTEM_LIBJPEG ON CACHE BOOL "Use the system version of libjpeg") 48 SET(USE_SYSTEM_LIBJPEG ON CACHE BOOL "Use the system version of libjpeg")
48 SET(USE_SYSTEM_CURL ON CACHE BOOL "Use the system version of LibCurl") 49 SET(USE_SYSTEM_CURL ON CACHE BOOL "Use the system version of LibCurl")
49 SET(USE_SYSTEM_OPENSSL ON CACHE BOOL "Use the system version of OpenSSL") 50 SET(USE_SYSTEM_OPENSSL ON CACHE BOOL "Use the system version of OpenSSL")
50 SET(USE_SYSTEM_ZLIB ON CACHE BOOL "Use the system version of ZLib") 51 SET(USE_SYSTEM_ZLIB ON CACHE BOOL "Use the system version of ZLib")
72 set(USE_BOOST_LOCALE_BACKEND OFF) 73 set(USE_BOOST_LOCALE_BACKEND OFF)
73 74
74 # Some basic inclusions 75 # Some basic inclusions
75 include(CheckIncludeFiles) 76 include(CheckIncludeFiles)
76 include(CheckIncludeFileCXX) 77 include(CheckIncludeFileCXX)
78 include(CheckFunctionExists)
77 include(CheckLibraryExists) 79 include(CheckLibraryExists)
78 include(FindPythonInterp) 80 include(FindPythonInterp)
79 include(${CMAKE_SOURCE_DIR}/Resources/CMake/AutoGeneratedCode.cmake) 81 include(${CMAKE_SOURCE_DIR}/Resources/CMake/AutoGeneratedCode.cmake)
80 include(${CMAKE_SOURCE_DIR}/Resources/CMake/DownloadPackage.cmake) 82 include(${CMAKE_SOURCE_DIR}/Resources/CMake/DownloadPackage.cmake)
81 include(${CMAKE_SOURCE_DIR}/Resources/CMake/Compiler.cmake) 83 include(${CMAKE_SOURCE_DIR}/Resources/CMake/Compiler.cmake)
301 include(${CMAKE_SOURCE_DIR}/Resources/CMake/MongooseConfiguration.cmake) 303 include(${CMAKE_SOURCE_DIR}/Resources/CMake/MongooseConfiguration.cmake)
302 include(${CMAKE_SOURCE_DIR}/Resources/CMake/PugixmlConfiguration.cmake) 304 include(${CMAKE_SOURCE_DIR}/Resources/CMake/PugixmlConfiguration.cmake)
303 include(${CMAKE_SOURCE_DIR}/Resources/CMake/SQLiteConfiguration.cmake) 305 include(${CMAKE_SOURCE_DIR}/Resources/CMake/SQLiteConfiguration.cmake)
304 include(${CMAKE_SOURCE_DIR}/Resources/CMake/ZlibConfiguration.cmake) 306 include(${CMAKE_SOURCE_DIR}/Resources/CMake/ZlibConfiguration.cmake)
305 include(${CMAKE_SOURCE_DIR}/Resources/CMake/GoogleTestConfiguration.cmake) 307 include(${CMAKE_SOURCE_DIR}/Resources/CMake/GoogleTestConfiguration.cmake)
308 include(${CMAKE_SOURCE_DIR}/Resources/CMake/LibIconvConfiguration.cmake)
306 309
307 # These are the two most heavyweight dependencies. We put them as the 310 # These are the two most heavyweight dependencies. We put them as the
308 # last includes to quickly spot problems when configuring static 311 # last includes to quickly spot problems when configuring static
309 # builds. 312 # builds.
310 include(${CMAKE_SOURCE_DIR}/Resources/CMake/BoostConfiguration.cmake) 313 include(${CMAKE_SOURCE_DIR}/Resources/CMake/BoostConfiguration.cmake)
464 ${AUTOGENERATED_SOURCES} 467 ${AUTOGENERATED_SOURCES}
465 468
466 ${BOOST_SOURCES} 469 ${BOOST_SOURCES}
467 ${CURL_SOURCES} 470 ${CURL_SOURCES}
468 ${JSONCPP_SOURCES} 471 ${JSONCPP_SOURCES}
472 ${LIBICONV_SOURCES}
473 ${LIBJPEG_SOURCES}
474 ${LIBP11_SOURCES}
469 ${LIBPNG_SOURCES} 475 ${LIBPNG_SOURCES}
470 ${LIBJPEG_SOURCES}
471 ${LUA_SOURCES} 476 ${LUA_SOURCES}
472 ${MONGOOSE_SOURCES} 477 ${MONGOOSE_SOURCES}
473 ${PUGIXML_SOURCES} 478 ${PUGIXML_SOURCES}
474 ${SQLITE_SOURCES} 479 ${SQLITE_SOURCES}
475 ${ZLIB_SOURCES} 480 ${ZLIB_SOURCES}
476 ${LIBP11_SOURCES}
477 481
478 ${CMAKE_SOURCE_DIR}/Resources/ThirdParty/md5/md5.c 482 ${CMAKE_SOURCE_DIR}/Resources/ThirdParty/md5/md5.c
479 ${CMAKE_SOURCE_DIR}/Resources/ThirdParty/base64/base64.cpp 483 ${CMAKE_SOURCE_DIR}/Resources/ThirdParty/base64/base64.cpp
480 484
481 # This is the minizip distribution to create ZIP files using zlib 485 # This is the minizip distribution to create ZIP files using zlib
555 endif() 559 endif()
556 560
557 add_library(ServeFolders SHARED 561 add_library(ServeFolders SHARED
558 ${BOOST_SOURCES} 562 ${BOOST_SOURCES}
559 ${JSONCPP_SOURCES} 563 ${JSONCPP_SOURCES}
564 ${LIBICONV_SOURCES}
560 Plugins/Samples/ServeFolders/Plugin.cpp 565 Plugins/Samples/ServeFolders/Plugin.cpp
561 Plugins/Samples/Common/OrthancPluginCppWrapper.cpp 566 Plugins/Samples/Common/OrthancPluginCppWrapper.cpp
562 ${SERVE_FOLDERS_RESOURCES} 567 ${SERVE_FOLDERS_RESOURCES}
563 ) 568 )
564 569
599 endif() 604 endif()
600 605
601 add_library(ModalityWorklists SHARED 606 add_library(ModalityWorklists SHARED
602 ${BOOST_SOURCES} 607 ${BOOST_SOURCES}
603 ${JSONCPP_SOURCES} 608 ${JSONCPP_SOURCES}
609 ${LIBICONV_SOURCES}
604 Plugins/Samples/Common/OrthancPluginCppWrapper.cpp 610 Plugins/Samples/Common/OrthancPluginCppWrapper.cpp
605 Plugins/Samples/ModalityWorklists/Plugin.cpp 611 Plugins/Samples/ModalityWorklists/Plugin.cpp
606 ${MODALITY_WORKLISTS_RESOURCES} 612 ${MODALITY_WORKLISTS_RESOURCES}
607 ) 613 )
608 614