From 8fd46d51b14eb09e1f9d9ed56edc1f30a71a7920 Mon Sep 17 00:00:00 2001 From: Max Bruckner Date: Wed, 12 Apr 2017 21:49:36 +0200 Subject: [PATCH] Put generated files in library_config subdirectory --- CMakeLists.txt | 8 ++++---- .../cJSONConfig.cmake.in | 0 .../cJSONConfigVersion.cmake.in | 0 libcjson.pc.in => library_config/libcjson.pc.in | 0 .../libcjson_utils.pc.in | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename cJSONConfig.cmake.in => library_config/cJSONConfig.cmake.in (100%) rename cJSONConfigVersion.cmake.in => library_config/cJSONConfigVersion.cmake.in (100%) rename libcjson.pc.in => library_config/libcjson.pc.in (100%) rename libcjson_utils.pc.in => library_config/libcjson_utils.pc.in (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9a8d14a..4fd5aa4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -103,7 +103,7 @@ if (NOT WIN32) target_link_libraries("${CJSON_LIB}" m) endif() -configure_file("${CMAKE_CURRENT_SOURCE_DIR}/libcjson.pc.in" +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/library_config/libcjson.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libcjson.pc" @ONLY) install(FILES cJSON.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/cjson") @@ -130,7 +130,7 @@ if(ENABLE_CJSON_UTILS) add_library("${CJSON_UTILS_LIB}" "${HEADERS_UTILS}" "${SOURCES_UTILS}") target_link_libraries("${CJSON_UTILS_LIB}" "${CJSON_LIB}") - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/libcjson_utils.pc.in" + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/library_config/libcjson_utils.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libcjson_utils.pc" @ONLY) install(TARGETS "${CJSON_UTILS_LIB}" DESTINATION "${CMAKE_INSTALL_LIBDIR}" EXPORT "${CJSON_UTILS_LIB}") @@ -149,10 +149,10 @@ endif() # create the other package config files configure_file( - cJSONConfig.cmake.in + "${CMAKE_CURRENT_SOURCE_DIR}/library_config/cJSONConfig.cmake.in" ${PROJECT_BINARY_DIR}/cJSONConfig.cmake @ONLY) configure_file( - cJSONConfigVersion.cmake.in + "${CMAKE_CURRENT_SOURCE_DIR}/library_config/cJSONConfigVersion.cmake.in" ${PROJECT_BINARY_DIR}/cJSONConfigVersion.cmake @ONLY) # Install package config files diff --git a/cJSONConfig.cmake.in b/library_config/cJSONConfig.cmake.in similarity index 100% rename from cJSONConfig.cmake.in rename to library_config/cJSONConfig.cmake.in diff --git a/cJSONConfigVersion.cmake.in b/library_config/cJSONConfigVersion.cmake.in similarity index 100% rename from cJSONConfigVersion.cmake.in rename to library_config/cJSONConfigVersion.cmake.in diff --git a/libcjson.pc.in b/library_config/libcjson.pc.in similarity index 100% rename from libcjson.pc.in rename to library_config/libcjson.pc.in diff --git a/libcjson_utils.pc.in b/library_config/libcjson_utils.pc.in similarity index 100% rename from libcjson_utils.pc.in rename to library_config/libcjson_utils.pc.in