aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoakim Soderberg <joakim.soderberg@gmail.com>2013-03-07 18:38:47 +0100
committerJoakim Soderberg <joakim.soderberg@gmail.com>2013-03-07 18:38:47 +0100
commit650707fcccdafd4ce09b62c6aab4990b5c8dd710 (patch)
treec38bf1b6b5ae20a3ffe58ae326f42df3a07fda19
parent33b0855b2729c47177504ba698b7aea1012cd672 (diff)
downloadjansson-650707fcccdafd4ce09b62c6aab4990b5c8dd710.zip
jansson-650707fcccdafd4ce09b62c6aab4990b5c8dd710.tar.gz
jansson-650707fcccdafd4ce09b62c6aab4990b5c8dd710.tar.bz2
Moved *config.h.cmake to the cmake directory.
-rw-r--r--CMakeLists.txt4
-rw-r--r--cmake/config.h.cmake (renamed from config.h.cmake)0
-rw-r--r--cmake/jansson_config.h.cmake (renamed from src/jansson_config.h.cmake)0
3 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 02073be..439df79 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -210,7 +210,7 @@ elseif (HAVE__SNPRINTF)
endif ()
# configure the public config file
-configure_file (${CMAKE_CURRENT_SOURCE_DIR}/src/jansson_config.h.cmake
+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/cmake/jansson_config.h.cmake
${CMAKE_CURRENT_BINARY_DIR}/include/jansson_config.h)
# Copy the jansson.h file to the public include folder
@@ -219,7 +219,7 @@ file (COPY ${CMAKE_CURRENT_SOURCE_DIR}/src/jansson.h
# configure the private config file
-configure_file (${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake
+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/cmake/config.h.cmake
${CMAKE_CURRENT_BINARY_DIR}/private_include/config.h)
# and tell the source code to include it
diff --git a/config.h.cmake b/cmake/config.h.cmake
index bc81178..bc81178 100644
--- a/config.h.cmake
+++ b/cmake/config.h.cmake
diff --git a/src/jansson_config.h.cmake b/cmake/jansson_config.h.cmake
index 335ccc4..335ccc4 100644
--- a/src/jansson_config.h.cmake
+++ b/cmake/jansson_config.h.cmake