This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, next has been updated via 4164c62dba16fc379e7a56e7a86c6ef21680144a (commit) via a41d621d30f73d4a17e4fd2d3ff30f87f1ed4ccc (commit) via a5768442636c7fe909e8afc205fd19ac13b9fbc2 (commit) from eebca92b95939f95b7e07c55c28f628344430a69 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4164c62dba16fc379e7a56e7a86c6ef21680144a commit 4164c62dba16fc379e7a56e7a86c6ef21680144a Merge: eebca92 a41d621 Author: Brad King <brad.k...@kitware.com> AuthorDate: Fri Feb 20 08:32:53 2015 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Fri Feb 20 08:32:53 2015 -0500 Merge topic 'private-FindJsonCpp' into next a41d621d bootstrap: Add --(no-)system-jsoncpp options a5768442 FindJsonCpp: Drop new module due to upstream jsoncpp providing package http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a41d621d30f73d4a17e4fd2d3ff30f87f1ed4ccc commit a41d621d30f73d4a17e4fd2d3ff30f87f1ed4ccc Author: Brad King <brad.k...@kitware.com> AuthorDate: Fri Feb 20 08:28:03 2015 -0500 Commit: Brad King <brad.k...@kitware.com> CommitDate: Fri Feb 20 08:28:03 2015 -0500 bootstrap: Add --(no-)system-jsoncpp options Provide bootstrap-time control for using a system JsonCpp library. diff --git a/bootstrap b/bootstrap index e7d0496..5f12ee0 100755 --- a/bootstrap +++ b/bootstrap @@ -398,6 +398,8 @@ Configuration: --no-system-curl use cmake-provided curl library (default) --system-expat use system-installed expat library --no-system-expat use cmake-provided expat library (default) + --system-jsoncpp use system-installed jsoncpp library + --no-system-jsoncpp use cmake-provided jsoncpp library (default) --system-zlib use system-installed zlib library --no-system-zlib use cmake-provided zlib library (default) --system-bzip2 use system-installed bzip2 library @@ -637,10 +639,10 @@ while test $# != 0; do --init=*) cmake_init_file=`cmake_arg "$1"` ;; --system-libs) cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARIES=1" ;; --no-system-libs) cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARIES=0" ;; - --system-bzip2|--system-curl|--system-expat|--system-libarchive|--system-zlib) + --system-bzip2|--system-curl|--system-expat|--system-jsoncpp|--system-libarchive|--system-zlib) lib=`cmake_arg "$1" "--system-"` cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARY_`cmake_toupper $lib`=1" ;; - --no-system-bzip2|--no-system-curl|--no-system-expat|--no-system-libarchive|--no-system-zlib) + --no-system-bzip2|--no-system-curl|--no-system-expat|--no-system-jsoncpp|--no-system-libarchive|--no-system-zlib) lib=`cmake_arg "$1" "--no-system-"` cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARY_`cmake_toupper $lib`=0" ;; --qt-gui) cmake_bootstrap_qt_gui="1" ;; http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a5768442636c7fe909e8afc205fd19ac13b9fbc2 commit a5768442636c7fe909e8afc205fd19ac13b9fbc2 Author: Brad King <brad.k...@kitware.com> AuthorDate: Fri Feb 20 08:15:43 2015 -0500 Commit: Brad King <brad.k...@kitware.com> CommitDate: Fri Feb 20 08:22:02 2015 -0500 FindJsonCpp: Drop new module due to upstream jsoncpp providing package Since jsoncpp 0.7.0 (2014-11-20) the upstream may provide a CMake package configuration file such that find_package(jsoncpp) will find a jsoncppConfig.cmake file. In order to avoid conflicting with this (especially on case-insensitive filesystems), and since we always prefer projects to provide package config files (that they maintain), it is better to not provide FindJsonCpp publicly. Move FindJsonCpp into a private source directory that is not installed so that we can still use it for building CMake itself. Reported-by: Ryan Pavlik <ryan.pav...@gmail.com> diff --git a/CMakeLists.txt b/CMakeLists.txt index e61621d..1250a94 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -382,10 +382,8 @@ macro (CMAKE_BUILD_UTILITIES) #--------------------------------------------------------------------- # Build jsoncpp library. if(CMAKE_USE_SYSTEM_JSONCPP) - if(EXISTS ${CMAKE_ROOT}/Modules/FindJsonCpp.cmake) - find_package(JsonCpp) - elseif(NOT CMAKE_VERSION VERSION_LESS 3.0) - include(${CMake_SOURCE_DIR}/Modules/FindJsonCpp.cmake) + if(NOT CMAKE_VERSION VERSION_LESS 3.0) + include(${CMake_SOURCE_DIR}/Source/Modules/FindJsonCpp.cmake) else() message(FATAL_ERROR "CMAKE_USE_SYSTEM_JSONCPP requires CMake >= 3.0") endif() diff --git a/Help/manual/cmake-modules.7.rst b/Help/manual/cmake-modules.7.rst index db56010..965eede 100644 --- a/Help/manual/cmake-modules.7.rst +++ b/Help/manual/cmake-modules.7.rst @@ -126,7 +126,6 @@ All Modules /module/FindJava /module/FindJNI /module/FindJPEG - /module/FindJsonCpp /module/FindKDE3 /module/FindKDE4 /module/FindLAPACK diff --git a/Help/module/FindJsonCpp.rst b/Help/module/FindJsonCpp.rst deleted file mode 100644 index ba87ece..0000000 --- a/Help/module/FindJsonCpp.rst +++ /dev/null @@ -1 +0,0 @@ -.. cmake-module:: ../../Modules/FindJsonCpp.cmake diff --git a/Help/release/3.2.rst b/Help/release/3.2.rst index ddc3d86..ef26dbe 100644 --- a/Help/release/3.2.rst +++ b/Help/release/3.2.rst @@ -124,9 +124,6 @@ Modules * A :module:`FindIntl` module was introduced to find the Gettext ``libintl`` library. -* A :module:`FindJsonCpp` module was introduced to find the - JsonCpp package. - * The :module:`FindLATEX` module learned to support components. * The :module:`FindMPI` module learned to find MS-MPI on Windows. diff --git a/Modules/FindJsonCpp.cmake b/Source/Modules/FindJsonCpp.cmake similarity index 97% rename from Modules/FindJsonCpp.cmake rename to Source/Modules/FindJsonCpp.cmake index cbb4fb3..014d3bd 100644 --- a/Modules/FindJsonCpp.cmake +++ b/Source/Modules/FindJsonCpp.cmake @@ -93,7 +93,7 @@ unset(_JsonCpp_H_REGEX) unset(_JsonCpp_H) #----------------------------------------------------------------------------- -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(${CMAKE_CURRENT_LIST_DIR}/../../Modules/FindPackageHandleStandardArgs.cmake) FIND_PACKAGE_HANDLE_STANDARD_ARGS(JsonCpp FOUND_VAR JsonCpp_FOUND REQUIRED_VARS JsonCpp_LIBRARY JsonCpp_INCLUDE_DIR diff --git a/Tests/FindJsonCpp/Test/CMakeLists.txt b/Tests/FindJsonCpp/Test/CMakeLists.txt index 4e1e271..d1dc647 100644 --- a/Tests/FindJsonCpp/Test/CMakeLists.txt +++ b/Tests/FindJsonCpp/Test/CMakeLists.txt @@ -2,6 +2,9 @@ cmake_minimum_required(VERSION 3.1) project(TestFindJsonCpp CXX) include(CTest) +# CMake does not actually provide FindJsonCpp publicly. +set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../Source/Modules) + find_package(JsonCpp REQUIRED) add_executable(test_jsoncpp_tgt main.cxx) ----------------------------------------------------------------------- Summary of changes: CMakeLists.txt | 6 ++---- Help/manual/cmake-modules.7.rst | 1 - Help/module/FindJsonCpp.rst | 1 - Help/release/3.2.rst | 3 --- {Modules => Source/Modules}/FindJsonCpp.cmake | 2 +- Tests/FindJsonCpp/Test/CMakeLists.txt | 3 +++ bootstrap | 6 ++++-- 7 files changed, 10 insertions(+), 12 deletions(-) delete mode 100644 Help/module/FindJsonCpp.rst rename {Modules => Source/Modules}/FindJsonCpp.cmake (97%) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits