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

This commit is contained in:
Steve Gerbino
2016-09-25 18:49:34 -04:00
parent fe941a26a3
commit 43afcc0d99

View File

@@ -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")