From aeae88dd32b5130c87929fb0d0bf0f97a17286c2 Mon Sep 17 00:00:00 2001 From: Florent Le Coz Date: Wed, 19 Feb 2014 02:49:22 +0100 Subject: =?UTF-8?q?Move=20CMake=E2=80=99s=20config.h(.cmake)=20files=20int?= =?UTF-8?q?o=20src/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 3 +-- config.h.cmake | 3 --- src/config.h.cmake | 3 +++ 3 files changed, 4 insertions(+), 5 deletions(-) delete mode 100644 config.h.cmake create mode 100644 src/config.h.cmake 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/config.h.cmake deleted file mode 100644 index 8ee0fd3..0000000 --- a/config.h.cmake +++ /dev/null @@ -1,3 +0,0 @@ -#cmakedefine ICONV_SECOND_ARGUMENT_IS_CONST -#cmakedefine LIBIDN_FOUND -#cmakedefine POLLER ${POLLER} diff --git a/src/config.h.cmake b/src/config.h.cmake new file mode 100644 index 0000000..8ee0fd3 --- /dev/null +++ b/src/config.h.cmake @@ -0,0 +1,3 @@ +#cmakedefine ICONV_SECOND_ARGUMENT_IS_CONST +#cmakedefine LIBIDN_FOUND +#cmakedefine POLLER ${POLLER} -- cgit v1.2.3