kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.pavlik@gmail.com>
This commit is contained in:
Brad King 2015-02-20 08:15:43 -05:00
parent da92cdab52
commit a576844263
6 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -382,10 +382,8 @@ macro (CMAKE_BUILD_UTILITIES)
#--------------------------------------------------------------------- #---------------------------------------------------------------------
# Build jsoncpp library. # Build jsoncpp library.
if(CMAKE_USE_SYSTEM_JSONCPP) if(CMAKE_USE_SYSTEM_JSONCPP)
if(EXISTS ${CMAKE_ROOT}/Modules/FindJsonCpp.cmake) if(NOT CMAKE_VERSION VERSION_LESS 3.0)
find_package(JsonCpp) include(${CMake_SOURCE_DIR}/Source/Modules/FindJsonCpp.cmake)
elseif(NOT CMAKE_VERSION VERSION_LESS 3.0)
include(${CMake_SOURCE_DIR}/Modules/FindJsonCpp.cmake)
else() else()
message(FATAL_ERROR "CMAKE_USE_SYSTEM_JSONCPP requires CMake >= 3.0") message(FATAL_ERROR "CMAKE_USE_SYSTEM_JSONCPP requires CMake >= 3.0")
endif() endif()

1
Help/manual/cmake-modules.7.rst
View File

@ -126,7 +126,6 @@ All Modules
/module/FindJava /module/FindJava
/module/FindJNI /module/FindJNI
/module/FindJPEG /module/FindJPEG
/module/FindJsonCpp
/module/FindKDE3 /module/FindKDE3
/module/FindKDE4 /module/FindKDE4
/module/FindLAPACK /module/FindLAPACK

1
Help/module/FindJsonCpp.rst
View File

@ -1 +0,0 @@
.. cmake-module:: ../../Modules/FindJsonCpp.cmake

3
Help/release/3.2.rst
View File

@ -124,9 +124,6 @@ Modules
* A :module:`FindIntl` module was introduced to find the * A :module:`FindIntl` module was introduced to find the
Gettext ``libintl`` library. Gettext ``libintl`` library.
* A :module:`FindJsonCpp` module was introduced to find the
JsonCpp package.
* The :module:`FindLATEX` module learned to support components. * The :module:`FindLATEX` module learned to support components.
* The :module:`FindMPI` module learned to find MS-MPI on Windows. * The :module:`FindMPI` module learned to find MS-MPI on Windows.

2
Modules/FindJsonCpp.cmake → Source/Modules/FindJsonCpp.cmake
View File

@ -93,7 +93,7 @@ unset(_JsonCpp_H_REGEX)
unset(_JsonCpp_H) unset(_JsonCpp_H)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) include(${CMAKE_CURRENT_LIST_DIR}/../../Modules/FindPackageHandleStandardArgs.cmake)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(JsonCpp FIND_PACKAGE_HANDLE_STANDARD_ARGS(JsonCpp
FOUND_VAR JsonCpp_FOUND FOUND_VAR JsonCpp_FOUND
REQUIRED_VARS JsonCpp_LIBRARY JsonCpp_INCLUDE_DIR REQUIRED_VARS JsonCpp_LIBRARY JsonCpp_INCLUDE_DIR

3
Tests/FindJsonCpp/Test/CMakeLists.txt
View File

@ -2,6 +2,9 @@ cmake_minimum_required(VERSION 3.1)
project(TestFindJsonCpp CXX) project(TestFindJsonCpp CXX)
include(CTest) include(CTest)
# CMake does not actually provide FindJsonCpp publicly.
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../Source/Modules)
find_package(JsonCpp REQUIRED) find_package(JsonCpp REQUIRED)
add_executable(test_jsoncpp_tgt main.cxx) add_executable(test_jsoncpp_tgt main.cxx)