From a4881f40d2862f193cc38f9759564370004215c4 Mon Sep 17 00:00:00 2001 From: Michael Steinert Date: Tue, 15 May 2012 18:03:46 -0600 Subject: Move TestCInline.cmake into cmake directory Signed-off-by: Michael Steinert --- CMakeLists.txt | 5 ++--- TestCInline.cmake | 28 ---------------------------- cmake/TestCInline.cmake | 28 ++++++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 31 deletions(-) delete mode 100644 TestCInline.cmake create mode 100644 cmake/TestCInline.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index a8fc7b1..b4f95e2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,8 @@ cmake_minimum_required(VERSION 2.8) project(rabbitmq-c "C") +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake) + #find python find_package(PythonInterp REQUIRED) @@ -19,7 +21,6 @@ if (CHECK_PYTHON_JSON_FAILED) endif (CHECK_PYTHON_SIMPLEJSON_FAILED) endif (CHECK_PYTHON_JSON_FAILED) -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}) include(TestCInline) option(FETCH_CODEGEN_FROM_GIT "Fetch codegen directly from the git repository" OFF) @@ -62,8 +63,6 @@ endif (FETCH_CODEGEN_FROM_GIT) mark_as_advanced(AMQP_CODEGEN_DIR) -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake) - find_package(POPT) option(BUILD_SHARED_LIBS "Build rabbitmq-c as a shared library" ON) diff --git a/TestCInline.cmake b/TestCInline.cmake deleted file mode 100644 index 4fdd4c5..0000000 --- a/TestCInline.cmake +++ /dev/null @@ -1,28 +0,0 @@ -#Inspired from http://www.cmake.org/Wiki/CMakeTestInline - -IF(NOT DEFINED C_INLINE_DETECTED) - - SET(INLINE_TEST_SRC "/* Inspired by autoconf's c.m4 */ -static inline int static_foo() {return 0\;} -int main(int argc, char *argv[]){return 0\;} -") - - FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/CMakeTestCInline.c ${INLINE_TEST_SRC}) - - FOREACH(KEYWORD "inline" "__inline__" "__inline") - IF(NOT DEFINED C_INLINE) - TRY_COMPILE(C_HAS_${KEYWORD} - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_BINARY_DIR}/CMakeTestCInline.c - COMPILE_DEFINITIONS "-Dinline=${KEYWORD}" - ) - IF(C_HAS_${KEYWORD}) - SET(C_INLINE ${KEYWORD}) - ENDIF(C_HAS_${KEYWORD}) - ENDIF(NOT DEFINED C_INLINE) - ENDFOREACH(KEYWORD) - - SET(C_INLINE_DETECTED True CACHE BOOL INTERNAL) - -ENDIF(NOT DEFINED C_INLINE_DETECTED) - diff --git a/cmake/TestCInline.cmake b/cmake/TestCInline.cmake new file mode 100644 index 0000000..4fdd4c5 --- /dev/null +++ b/cmake/TestCInline.cmake @@ -0,0 +1,28 @@ +#Inspired from http://www.cmake.org/Wiki/CMakeTestInline + +IF(NOT DEFINED C_INLINE_DETECTED) + + SET(INLINE_TEST_SRC "/* Inspired by autoconf's c.m4 */ +static inline int static_foo() {return 0\;} +int main(int argc, char *argv[]){return 0\;} +") + + FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/CMakeTestCInline.c ${INLINE_TEST_SRC}) + + FOREACH(KEYWORD "inline" "__inline__" "__inline") + IF(NOT DEFINED C_INLINE) + TRY_COMPILE(C_HAS_${KEYWORD} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR}/CMakeTestCInline.c + COMPILE_DEFINITIONS "-Dinline=${KEYWORD}" + ) + IF(C_HAS_${KEYWORD}) + SET(C_INLINE ${KEYWORD}) + ENDIF(C_HAS_${KEYWORD}) + ENDIF(NOT DEFINED C_INLINE) + ENDFOREACH(KEYWORD) + + SET(C_INLINE_DETECTED True CACHE BOOL INTERNAL) + +ENDIF(NOT DEFINED C_INLINE_DETECTED) + -- cgit v1.2.1