From 43afcc0d99a43608eaf6f6a1ff49cc0df864669b Mon Sep 17 00:00:00 2001 From: Steve Gerbino Date: Sun, 25 Sep 2016 18:49:34 -0400 Subject: [PATCH] Lowered CMake required version so that Travis CI is able to build, moved include folder to include/json-c to match the behavior of autotools --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0d7156f..f278d5f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ #Licensed under the MIT license. See LICENSE file in the project root for full license information. -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.7) project(json-c) if(MSVC) @@ -63,5 +63,5 @@ install(TARGETS json-c LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) -install(DIRECTORY . DESTINATION ${CMAKE_INSTALL_PREFIX}/include FILES_MATCHING PATTERN "*.h") -install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/ DESTINATION ${CMAKE_INSTALL_PREFIX}/include FILES_MATCHING PATTERN "*.h") +install(DIRECTORY . DESTINATION ${CMAKE_INSTALL_PREFIX}/include/json-c FILES_MATCHING PATTERN "*.h") +install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/ DESTINATION ${CMAKE_INSTALL_PREFIX}/include/json-c FILES_MATCHING PATTERN "*.h") -- 2.50.1