TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 08:15:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

CMake: Rename 'Distribution' config to 'Standard'

Browse Source 
This is the configuration shipped to Python developers
in the form of the public SDK.
This commit is contained in:
Sam Edwards 2019-09-19 22:15:34 -06:00
parent 8429f50d3a
commit bd1605907e
2 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dtool/CompilerFlags.cmake
View File

@ -8,6 +8,14 @@
include(CheckCXXCompilerFlag) include(CheckCXXCompilerFlag)
# These are flags for the custom configurations we add
# Standard
set(CMAKE_C_FLAGS_STANDARD "-O3")
set(CMAKE_CXX_FLAGS_STANDARD "-O3")
set(CMAKE_SHARED_LINKER_FLAGS_STANDARD "")
set(CMAKE_MODULE_LINKER_FLAGS_STANDARD "")
set(CMAKE_EXE_LINKER_FLAGS_STANDARD "")
# Panda3D is now a C++11 project. Newer versions of CMake support this out of # Panda3D is now a C++11 project. Newer versions of CMake support this out of
# the box; for older versions we take a shot in the dark: # the box; for older versions we take a shot in the dark:
if(CMAKE_VERSION VERSION_LESS "3.1") if(CMAKE_VERSION VERSION_LESS "3.1")
@ -101,6 +109,7 @@ if(NOT "x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wno-unused-variable") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wno-unused-variable")
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -Wno-unused-variable") set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -Wno-unused-variable")
set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -Wno-unused-variable") set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -Wno-unused-variable")
set(CMAKE_CXX_FLAGS_STANDARD "${CMAKE_CXX_FLAGS_STANDARD} -Wno-unused-variable")
if(MSVC) if(MSVC)
# Clang behaving as MSVC # Clang behaving as MSVC
@ -187,11 +196,3 @@ if(NOT MSVC)
add_compile_options("-fvisibility=hidden") add_compile_options("-fvisibility=hidden")
endif() endif()
endif() endif()
# These are flags for the custom configurations we add
# Distribution
set(CMAKE_C_FLAGS_DISTRIBUTION "")
set(CMAKE_CXX_FLAGS_DISTRIBUTION "")
set(CMAKE_SHARED_LINKER_FLAGS_DISTRIBUTION "")
set(CMAKE_MODULE_LINKER_FLAGS_DISTRIBUTION "")
set(CMAKE_EXE_LINKER_FLAGS_DISTRIBUTION "")

12
dtool/Config.cmake
View File

@ -36,7 +36,7 @@ endif()
# Define the type of build we are setting up. # Define the type of build we are setting up.
if(IS_MULTICONFIG) if(IS_MULTICONFIG)
set(CMAKE_CONFIGURATION_TYPES Release RelWithDebInfo Debug MinSizeRel Distribution) set(CMAKE_CONFIGURATION_TYPES Release RelWithDebInfo Debug MinSizeRel Standard)
else() else()
# CMAKE_BUILD_TYPE can't just be set using the usual set(CACHE) method since # CMAKE_BUILD_TYPE can't just be set using the usual set(CACHE) method since
# it's an empty string by default. # it's an empty string by default.
@ -44,7 +44,7 @@ else()
set(CMAKE_BUILD_TYPE RelWithDebInfo) set(CMAKE_BUILD_TYPE RelWithDebInfo)
endif() endif()
set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS
Release RelWithDebInfo Debug MinSizeRel Distribution) Release RelWithDebInfo Debug MinSizeRel Standard)
endif() endif()
# Provide convenient boolean expression based on build type # Provide convenient boolean expression based on build type
@ -64,14 +64,6 @@ else()
set(IS_NOT_MINSIZE_BUILD True) set(IS_NOT_MINSIZE_BUILD True)
endif() endif()
if(CMAKE_BUILD_TYPE MATCHES "Distribution")
set(IS_DIST_BUILD True)
set(IS_NOT_DIST_BUILD False)
else()
set(IS_DIST_BUILD False)
set(IS_NOT_DIST_BUILD True)
endif()
set(PER_CONFIG_OPTIONS) set(PER_CONFIG_OPTIONS)
# Are we building with static or dynamic linking? # Are we building with static or dynamic linking?