duuqnd/cave-story-solaris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added code that prints the compiler ID and fixed bin2h's compiler detection code to use the C compiler ID of the C++ compiler ID (which isn't available then as bin2h is in c)

Browse source 
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
This commit is contained in:
Gabriel Ravier 2019-10-27 21:22:10 +01:00
parent d6ec92cba5
commit 01abc0541a
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -18,6 +18,8 @@ set(RENDERER "SDLTexture" CACHE STRING "Which renderer the game should use: 'Ope
project(CSE2 LANGUAGES C CXX) project(CSE2 LANGUAGES C CXX)
message(STATUS "Compiler ID : ${CMAKE_CXX_COMPILER_ID}")
# Has to be placed after "project()" # Has to be placed after "project()"
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
# Using Clang (this is a match so that we also get "AppleClang" which is the Apple-provided Clang # Using Clang (this is a match so that we also get "AppleClang" which is the Apple-provided Clang

8
bin2h/CMakeLists.txt
View file

@ -14,20 +14,22 @@ set_target_properties(bin2h PROPERTIES
C_EXTENSIONS OFF C_EXTENSIONS OFF
) )
message(STATUS "Compiler ID : ${CMAKE_C_COMPILER_ID}")
# Has to be placed after "project()" # Has to be placed after "project()"
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") if (CMAKE_C_COMPILER_ID MATCHES "Clang")
# Using Clang (this is a match so that we also get "AppleClang" which is the Apple-provided Clang # Using Clang (this is a match so that we also get "AppleClang" which is the Apple-provided Clang
set(COMPILER_IS_CLANG true) set(COMPILER_IS_CLANG true)
message(STATUS "Compiling with clang") message(STATUS "Compiling with clang")
endif() endif()
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") if (CMAKE_C_COMPILER_ID STREQUAL "GNU")
# Using GCC # Using GCC
set(COMPILER_IS_GCC true) set(COMPILER_IS_GCC true)
message(STATUS "Compiling with gcc") message(STATUS "Compiling with gcc")
endif() endif()
if (CMAKE_CXX_COMPILER_ID STREQUAL "Intel") if (CMAKE_C_COMPILER_ID STREQUAL "Intel")
# Using Intel C++ # Using Intel C++
set(COMPILER_IS_ICC true) set(COMPILER_IS_ICC true)
message(STATUS "Compiling with ICC") message(STATUS "Compiling with ICC")