diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2013-08-28 22:37:39 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2013-08-28 22:37:39 +0000 |
| commit | 678e881a82dcccdb679662ee184b2973453bfbf2 (patch) | |
| tree | 943eb3aa27b1c41f42c7afed8b9e3c5a9b903921 /qpid/cpp/src/CMakeLists.txt | |
| parent | 2da5b3e2f3f5018e995d7db39b757a885183a8e4 (diff) | |
| download | qpid-python-678e881a82dcccdb679662ee184b2973453bfbf2.tar.gz | |
QPID-5079: Deal better with compiling on 32 bit architectures
- The API check now varies the expansion it uses for uint64_t/int64_t/size_t
by getting the compiler to tell it the actual type.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1518408 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/CMakeLists.txt')
| -rw-r--r-- | qpid/cpp/src/CMakeLists.txt | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/qpid/cpp/src/CMakeLists.txt b/qpid/cpp/src/CMakeLists.txt index 1335578146..9e48c240b5 100644 --- a/qpid/cpp/src/CMakeLists.txt +++ b/qpid/cpp/src/CMakeLists.txt @@ -26,6 +26,16 @@ foreach (r ${REQUIRE}) message(STATUS "Forcing ${r} to ${${r}_force}") endforeach(r) +# Capture specified C++ compiler (if any) +if (NOT ENV_CXX) + if (NOT "$ENV{CXX}" STREQUAL "") + set(CXX $ENV{CXX}) + else(NOT "$ENV{CXX}" STREQUAL "") + set(CXX ${CMAKE_CXX_COMPILER}) + endif(NOT "$ENV{CXX}" STREQUAL "") + set(ENV_CXX ${CXX} CACHE INTERNAL "C++ compiler specified in cmake environment") +endif (NOT ENV_CXX) + include(CheckFunctionExists) include(CheckIncludeFileCXX) include(CheckIncludeFiles) @@ -148,7 +158,7 @@ ENDMACRO (add_msvc_version) # Add a test to check the exported library API against expected API symbols MACRO (add_api_test libname) if (NOT CMAKE_SYSTEM_NAME STREQUAL Windows) - add_test(api_check_${libname} ${CMAKE_CURRENT_SOURCE_DIR}/check-abi ${CMAKE_CURRENT_BINARY_DIR}/lib${libname}.so ${CMAKE_CURRENT_SOURCE_DIR}/lib${libname}-api-symbols.txt) + add_test(api_check_${libname} ${CMAKE_CURRENT_SOURCE_DIR}/check-abi "${ENV_CXX}" ${CMAKE_CURRENT_BINARY_DIR}/lib${libname}.so ${CMAKE_CURRENT_SOURCE_DIR}/lib${libname}-api-symbols.txt) endif (NOT CMAKE_SYSTEM_NAME STREQUAL Windows) ENDMACRO (add_api_test libname) |