summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorent Le Coz <louiz@louiz.org>2014-02-19 02:49:22 +0100
committerFlorent Le Coz <louiz@louiz.org>2014-02-19 02:49:22 +0100
commitaeae88dd32b5130c87929fb0d0bf0f97a17286c2 (patch)
tree4b7e7538600c073694b5b9e496bcd083b616b008
parent6804f315464b592eeece8c8837b21c9cd1db074d (diff)
downloadbiboumi-aeae88dd32b5130c87929fb0d0bf0f97a17286c2.tar.gz
biboumi-aeae88dd32b5130c87929fb0d0bf0f97a17286c2.tar.bz2
biboumi-aeae88dd32b5130c87929fb0d0bf0f97a17286c2.tar.xz
biboumi-aeae88dd32b5130c87929fb0d0bf0f97a17286c2.zip
Move CMake’s config.h(.cmake) files into src/
-rw-r--r--CMakeLists.txt3
-rw-r--r--src/config.h.cmake (renamed from config.h.cmake)0
2 files changed, 1 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index edbc87e..21bfb78 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,7 +22,6 @@ find_package(EXPAT REQUIRED)
find_package(Libidn)
# To be able to include the config.h file generated by cmake
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
include_directories("src/")
include_directories(${EXPAT_INCLUDE_DIRS})
include_directories(${ICONV_INCLUDE_DIRS})
@@ -140,7 +139,7 @@ target_link_libraries(test
config
logger)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/config.h)
#
## Install target
diff --git a/config.h.cmake b/src/config.h.cmake
index 8ee0fd3..8ee0fd3 100644
--- a/config.h.cmake
+++ b/src/config.h.cmake