Skip to content

Commit 89cf910

Browse files
crazyhappygamedrelaptop
authored andcommitted
modern cmake, cmake_cleanup_remove_unused_variables (#19146)
1 parent e328313 commit 89cf910

File tree

2 files changed

+0
-53
lines changed

2 files changed

+0
-53
lines changed

cmake/Modules/CocosBuildSet.cmake

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
# Disable in-source builds to prevent source tree corruption.
2-
if(" ${CMAKE_SOURCE_DIR}" STREQUAL " ${CMAKE_BINARY_DIR}")
3-
message(FATAL_ERROR "
4-
FATAL: In-source builds are not allowed.
5-
You should create a separate directory for build files.
6-
")
7-
endif()
8-
91
# print cmake debug info
102
set(CMAKE_DEBUG_TARGET_PROPERTIES
113
# INCLUDE_DIRECTORIES
@@ -14,29 +6,14 @@ set(CMAKE_DEBUG_TARGET_PROPERTIES
146
# AUTOUIC_OPTIONS
157
# POSITION_INDEPENDENT_CODE
168
)
17-
# It ensures that when Find*.cmake files included from cmake's Modules dir
18-
# include another *.cmake file with relative path, that file will be included
19-
# also from cmake's Modules dir, to not clash with per-project files.
20-
cmake_policy(SET CMP0017 NEW)
21-
22-
# Use new behaviour with cmake >= 3.1:
23-
# Only interpret if() arguments as variables or keywords when unquoted.
24-
cmake_policy(SET CMP0054 NEW)
25-
26-
# print the info of CMAKE_TOOLCHAIN_FILE, if defined it
27-
if(DEFINED CMAKE_TOOLCHAIN_FILE)
28-
message(STATUS "using toolchain file: ${CMAKE_TOOLCHAIN_FILE}")
29-
endif()
309

3110
# some useful variables for every one cocos project
32-
set(COCOS_EXTERNAL_DIR ${COCOS2DX_ROOT_PATH}/external)
3311
set(ENGINE_BINARY_PATH ${PROJECT_BINARY_DIR}/engine)
3412

3513
message(STATUS "PROJECT_NAME:" ${PROJECT_NAME})
3614
message(STATUS "PROJECT_SOURCE_DIR:" ${PROJECT_SOURCE_DIR})
3715
message(STATUS "COCOS2DX_ROOT_PATH:" ${COCOS2DX_ROOT_PATH})
3816
message(STATUS "CMAKE_MODULE_PATH:" ${CMAKE_MODULE_PATH})
39-
message(STATUS "COCOS_EXTERNAL_DIR:" ${COCOS_EXTERNAL_DIR})
4017
# delete binary dir if you hope a full clean re-build
4118
message(STATUS "PROJECT_BINARY_DIR:" ${PROJECT_BINARY_DIR})
4219
message(STATUS "ENGINE_BINARY_PATH:" ${ENGINE_BINARY_PATH})

cmake/Modules/CocosConfigDefine.cmake

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,23 @@
66
#LINUX = Linux
77
if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
88
set(WINDOWS TRUE)
9-
set(SYSTEM_STRING "Windows Desktop")
109
set(PLATFORM_FOLDER win32)
1110
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Android")
12-
set(SYSTEM_STRING "Android")
1311
set(PLATFORM_FOLDER android)
1412
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
1513
if(ANDROID)
16-
set(SYSTEM_STRING "Android")
1714
set(PLATFORM_FOLDER android)
1815
else()
1916
set(LINUX TRUE)
20-
set(SYSTEM_STRING "Linux")
2117
set(PLATFORM_FOLDER linux)
2218
endif()
2319
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
2420
if(IOS)
2521
set(APPLE TRUE)
26-
set(SYSTEM_STRING "IOS")
2722
set(PLATFORM_FOLDER ios)
2823
else()
2924
set(APPLE TRUE)
3025
set(MACOSX TRUE)
31-
set(SYSTEM_STRING "Mac OSX")
3226
set(PLATFORM_FOLDER mac)
3327
endif()
3428
else()
@@ -78,30 +72,6 @@ define_property(TARGET
7872
FULL_DOCS "use to save depend libs of cocos2d lua project"
7973
)
8074

81-
# check and print compiler infos
82-
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
83-
set(COMPILER_STRING ${CMAKE_CXX_COMPILER_ID})
84-
set(CLANG TRUE)
85-
elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
86-
if(MINGW)
87-
set(COMPILER_STRING "Mingw GCC")
88-
else()
89-
set(COMPILER_STRING "GCC")
90-
endif()
91-
elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
92-
set(COMPILER_STRING "${CMAKE_CXX_COMPILER_ID} C++")
93-
elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
94-
set(COMPILER_STRING "Visual Studio C++")
95-
else()
96-
set(COMPILER_STRING "${CMAKE_CXX_COMPILER_ID}")
97-
endif()
98-
if(CMAKE_CROSSCOMPILING)
99-
set(BUILDING_STRING "It appears you are cross compiling for ${SYSTEM_STRING} with ${COMPILER_STRING}")
100-
else()
101-
set(BUILDING_STRING "It appears you are building natively for ${SYSTEM_STRING} with ${COMPILER_STRING}")
102-
endif()
103-
message(STATUS ${BUILDING_STRING})
104-
10575
# check c++ standard
10676
set(CMAKE_C_STANDARD 99)
10777
set(CMAKE_C_STANDARD_REQUIRED ON)

0 commit comments

Comments
 (0)