# HG changeset patch # User Sebastien Jodogne # Date 1349443400 -7200 # Node ID 1267071a697ea90cfb86185655af488eed50b16d # Parent 7350aff151937ec926f3cbab4e74534f2fc59854 dynamic jsoncpp in debian unstable diff -r 7350aff15193 -r 1267071a697e CMakeLists.txt --- a/CMakeLists.txt Fri Oct 05 10:19:52 2012 +0200 +++ b/CMakeLists.txt Fri Oct 05 15:23:20 2012 +0200 @@ -11,6 +11,7 @@ SET(ENABLE_SSL ON CACHE BOOL "Include support for SSL") SET(BUILD_UNIT_TESTS ON CACHE BOOL "Build the unit tests") SET(DEBIAN_HARDENING OFF CACHE BOOL "Use Debian hardening flags") +SET(USE_DYNAMIC_JSONCPP OFF CACHE BOOL "Use the dynamic version of JsonCpp, only for Debian Unstable") if (${CMAKE_CROSSCOMPILING}) SET(STANDALONE_BUILD ON) diff -r 7350aff15193 -r 1267071a697e Resources/CMake/JsonCppConfiguration.cmake --- a/Resources/CMake/JsonCppConfiguration.cmake Fri Oct 05 10:19:52 2012 +0200 +++ b/Resources/CMake/JsonCppConfiguration.cmake Fri Oct 05 15:23:20 2012 +0200 @@ -1,14 +1,25 @@ -SET(JSONCPP_SOURCES_DIR ${CMAKE_BINARY_DIR}/jsoncpp-src-0.5.0) -DownloadPackage("http://downloads.sourceforge.net/project/jsoncpp/jsoncpp/0.5.0/jsoncpp-src-0.5.0.tar.gz" "${JSONCPP_SOURCES_DIR}" "" "") +if (USE_DYNAMIC_JSONCPP) + CHECK_INCLUDE_FILE_CXX(jsoncpp/json/reader.h HAVE_JSONCPP_H) + if (NOT HAVE_JSONCPP_H) + message(FATAL_ERROR "Please install the libjsoncpp-dev package") + endif() + + link_libraries(jsoncpp) + +else() + SET(JSONCPP_SOURCES_DIR ${CMAKE_BINARY_DIR}/jsoncpp-src-0.5.0) + DownloadPackage("http://downloads.sourceforge.net/project/jsoncpp/jsoncpp/0.5.0/jsoncpp-src-0.5.0.tar.gz" "${JSONCPP_SOURCES_DIR}" "" "") -list(APPEND THIRD_PARTY_SOURCES - ${JSONCPP_SOURCES_DIR}/src/lib_json/json_reader.cpp - ${JSONCPP_SOURCES_DIR}/src/lib_json/json_value.cpp - ${JSONCPP_SOURCES_DIR}/src/lib_json/json_writer.cpp - ) + list(APPEND THIRD_PARTY_SOURCES + ${JSONCPP_SOURCES_DIR}/src/lib_json/json_reader.cpp + ${JSONCPP_SOURCES_DIR}/src/lib_json/json_value.cpp + ${JSONCPP_SOURCES_DIR}/src/lib_json/json_writer.cpp + ) -include_directories( - ${JSONCPP_SOURCES_DIR}/include - ) + include_directories( + ${JSONCPP_SOURCES_DIR}/include + ) -source_group(ThirdParty\\JsonCpp REGULAR_EXPRESSION ${JSONCPP_SOURCES_DIR}/.*) + source_group(ThirdParty\\JsonCpp REGULAR_EXPRESSION ${JSONCPP_SOURCES_DIR}/.*) +endif() +