summaryrefslogtreecommitdiffstats
path: root/Tests/FindJsonCpp
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-02-20 13:15:43 (GMT)
committerBrad King <brad.king@kitware.com>2015-02-20 13:22:02 (GMT)
commita5768442636c7fe909e8afc205fd19ac13b9fbc2 (patch)
treeaf7f2655b1115192c0435d74c3965169b0eafba0 /Tests/FindJsonCpp
parentda92cdab5206d0556822ee12350636300ec73160 (diff)
downloadCMake-a5768442636c7fe909e8afc205fd19ac13b9fbc2.zip
CMake-a5768442636c7fe909e8afc205fd19ac13b9fbc2.tar.gz
CMake-a5768442636c7fe909e8afc205fd19ac13b9fbc2.tar.bz2
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>
Diffstat (limited to 'Tests/FindJsonCpp')
-rw-r--r--Tests/FindJsonCpp/Test/CMakeLists.txt3
1 files changed, 3 insertions, 0 deletions
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)