diff options
| author | Alan Antonuk <alan.antonuk@gmail.com> | 2012-11-13 19:31:59 -0500 |
|---|---|---|
| committer | Alan Antonuk <alan.antonuk@gmail.com> | 2012-11-14 23:03:00 -0500 |
| commit | eb23f97aeb0f728adf6bc440966233b91cbda6d3 (patch) | |
| tree | 9a11798c76974cb772006da2b3e5dbfccb8c625d /cmake | |
| parent | b28e7cd14556f974e79a170a2a0956707a10df6d (diff) | |
| download | rabbitmq-c-github-ask-eb23f97aeb0f728adf6bc440966233b91cbda6d3.tar.gz | |
Refactor TestCInline.cmake script
Refactor TestCInline cmake script to save the inline keyword in the
cmake cache so it won't get lost on a cmake reconfigure.
Print status message of which inlining keyword was selected
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/TestCInline.cmake | 8 | ||||
| -rw-r--r-- | cmake/config.h.in | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/cmake/TestCInline.cmake b/cmake/TestCInline.cmake index 4fdd4c5..6343646 100644 --- a/cmake/TestCInline.cmake +++ b/cmake/TestCInline.cmake @@ -1,6 +1,6 @@ #Inspired from http://www.cmake.org/Wiki/CMakeTestInline -IF(NOT DEFINED C_INLINE_DETECTED) +IF(NOT DEFINED C_INLINE_KEYWORD) SET(INLINE_TEST_SRC "/* Inspired by autoconf's c.m4 */ static inline int static_foo() {return 0\;} @@ -22,7 +22,7 @@ int main(int argc, char *argv[]){return 0\;} ENDIF(NOT DEFINED C_INLINE) ENDFOREACH(KEYWORD) - SET(C_INLINE_DETECTED True CACHE BOOL INTERNAL) - -ENDIF(NOT DEFINED C_INLINE_DETECTED) + SET(C_INLINE_KEYWORD ${C_INLINE} CACHE INTERNAL "The keyword needed by the C compiler to inline a function" FORCE) + message(STATUS "Found C inline keyword: ${C_INLINE_KEYWORD}") +ENDIF(NOT DEFINED C_INLINE_KEYWORD) diff --git a/cmake/config.h.in b/cmake/config.h.in index 91cdc0b..3e2d932 100644 --- a/cmake/config.h.in +++ b/cmake/config.h.in @@ -4,7 +4,7 @@ #define VERSION "${VERSION}" #ifndef __cplusplus -# define inline ${C_INLINE} +# define inline ${C_INLINE_KEYWORD} #endif #endif /* CONFIG_H */ |