diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-12-02 04:36:33 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-12-02 04:36:33 +0400 |
| commit | a10cf5c99e339a81bfd151f22490b2541e2751aa (patch) | |
| tree | 3dfc898b2c3e339af626c5416518fcd159378125 | |
| parent | 6b54752c2e1bb0fff2a1abbd5a04612355d5de49 (diff) | |
CMake: check CMAKE_C_COMPILER_ID instead of CMAKE_CXX_COMPILER_ID
While its possible to have different C/C++ compilers, we dont support
this at the moment, so just check C compiler ID for now.
| -rw-r--r-- | CMakeLists.txt | 11 | ||||
| -rw-r--r-- | build_files/cmake/macros.cmake | 4 |
2 files changed, 9 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6767fb92277..1ff10d9377b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -922,10 +922,10 @@ if(UNIX AND NOT APPLE) if(CMAKE_COMPILER_IS_GNUCC) set(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing") # CLang is the same as GCC for now. - elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang") + elseif(CMAKE_C_COMPILER_ID MATCHES "Clang") set(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing") # Solaris CC - elseif(CMAKE_CXX_COMPILER_ID MATCHES "SunPro") + elseif(CMAKE_C_COMPILER_ID MATCHES "SunPro") set(PLATFORM_CFLAGS "-pipe -features=extensions -fPIC -D__FUNCTION__=__func__") # Intel C++ Compiler @@ -1781,7 +1781,7 @@ elseif(APPLE) if(CMAKE_OSX_ARCHITECTURES MATCHES "x86_64" OR CMAKE_OSX_ARCHITECTURES MATCHES "i386") set(CMAKE_CXX_FLAGS_RELEASE "-O2 -mdynamic-no-pic -msse -msse2 -msse3 -mssse3") set(CMAKE_C_FLAGS_RELEASE "-O2 -mdynamic-no-pic -msse -msse2 -msse3 -mssse3") - if(NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang") + if(NOT CMAKE_C_COMPILER_ID MATCHES "Clang") set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -ftree-vectorize -fvariable-expansion-in-unroller") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -ftree-vectorize -fvariable-expansion-in-unroller") endif() @@ -2028,7 +2028,7 @@ if(CMAKE_COMPILER_IS_GNUCC) ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_ERROR_UNUSED_BUT_SET_VARIABLE -Wno-error=unused-but-set-variable) endif() -elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang") +elseif(CMAKE_C_COMPILER_ID MATCHES "Clang") # strange, clang complains these are not supported, but then yses them. ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ALL -Wall) @@ -2241,6 +2241,9 @@ if(FIRST_RUN) endmacro() + message(STATUS "C Compiler: \"${CMAKE_C_COMPILER_ID}\"") + message(STATUS "C++ Compiler: \"${CMAKE_CXX_COMPILER_ID}\"") + info_cfg_text("Build Options:") info_cfg_option(WITH_GAMEENGINE) info_cfg_option(WITH_PLAYER) diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index e7e88ad5703..0bf31f7e678 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -530,7 +530,7 @@ macro(remove_strict_flags) add_cc_flag("${CC_REMOVE_STRICT_FLAGS}") endif() - if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") + if(CMAKE_C_COMPILER_ID MATCHES "Clang") remove_cc_flag("-Wunused-parameter") remove_cc_flag("-Wunused-variable") remove_cc_flag("-Werror=[^ ]+") @@ -555,7 +555,7 @@ macro(remove_strict_flags_file foreach(_SOURCE ${ARGV}) if(CMAKE_COMPILER_IS_GNUCC OR - (CMAKE_CXX_COMPILER_ID MATCHES "Clang")) + (CMAKE_C_COMPILER_ID MATCHES "Clang")) set_source_files_properties(${_SOURCE} PROPERTIES |