From 0c645c53f3f5535145526c5e49bdf994daa6f44c Mon Sep 17 00:00:00 2001 From: Santosh Multhalli Date: Tue, 1 Mar 2016 12:20:25 +0530 Subject: [PATCH 1/3] Add options for Building Installing valijson headers and remove -Werror from CMAKE_CXX_FLAGS --- CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6d3f479..984c5f4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,10 @@ cmake_minimum_required (VERSION 2.6) project (valijson) -SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror") +option (INSTALL_HEADERS "Install valijson Headers." TRUE) +option (BUILD_EXAMPLES "Build valijson Examples." FALSE) +option (BUILD_TESTS "Build valijson Tests." FALSE) +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall ") SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0") if(VALIJSON_CXX11_ADAPTERS STREQUAL "disabled") message(STATUS "Building with C++11 support disabled") From 0c5de11cb2935071efe1ce6cfe5174aa82ba92ca Mon Sep 17 00:00:00 2001 From: Bimal Jacob Date: Thu, 19 Nov 2015 09:55:53 -0600 Subject: [PATCH 2/3] CMake: Add conditional check for options Signed-off-by: Bimal Jacob Signed-off-by: Santosh Multhalli --- CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 984c5f4..b529a9a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,6 +5,7 @@ option (INSTALL_HEADERS "Install valijson Headers." TRUE) option (BUILD_EXAMPLES "Build valijson Examples." FALSE) option (BUILD_TESTS "Build valijson Tests." FALSE) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall ") +if (BUILD_TESTS OR BUILD_EXAMPLES) SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0") if(VALIJSON_CXX11_ADAPTERS STREQUAL "disabled") message(STATUS "Building with C++11 support disabled") @@ -110,4 +111,8 @@ endif() target_link_libraries(test_suite ${TEST_LIBS} ${Boost_LIBRARIES}) target_link_libraries(custom_schema ${Boost_LIBRARIES}) target_link_libraries(external_schema ${Boost_LIBRARIES}) +endif() +if (INSTALL_HEADERS ) +install(DIRECTORY include/ DESTINATION include ) +endif() From 4a543d53e3ab0a26ac3f31c98de88e583c7eee95 Mon Sep 17 00:00:00 2001 From: Tristan Penman Date: Sat, 9 Apr 2016 08:15:49 +1000 Subject: [PATCH 3/3] Build tests by default --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b529a9a..9eec952 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,9 +1,9 @@ cmake_minimum_required (VERSION 2.6) project (valijson) -option (INSTALL_HEADERS "Install valijson Headers." TRUE) +option (INSTALL_HEADERS "Install valijson Headers." FALSE) option (BUILD_EXAMPLES "Build valijson Examples." FALSE) -option (BUILD_TESTS "Build valijson Tests." FALSE) +option (BUILD_TESTS "Build valijson Tests." TRUE) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall ") if (BUILD_TESTS OR BUILD_EXAMPLES) SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0")