Revision: 77976
http://sourceforge.net/p/brlcad/code/77976
Author: starseeker
Date: 2020-12-16 14:46:16 +0000 (Wed, 16 Dec 2020)
Log Message:
-----------
Merge from trunk - r77945 through r77974
Modified Paths:
--------------
brlcad/branches/extbuild/CMakeLists.txt
Modified: brlcad/branches/extbuild/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/CMakeLists.txt 2020-12-16 14:45:12 UTC (rev
77975)
+++ brlcad/branches/extbuild/CMakeLists.txt 2020-12-16 14:46:16 UTC (rev
77976)
@@ -1003,25 +1003,23 @@
endif(NOT BRLCAD_ENABLE_PROFILING AND NOT BRLCAD_FLAGS_DEBUG)
endif(${BRLCAD_OPTIMIZED_BUILD} MATCHES "ON")
- # add optimization flags to either all configurations, if enabled,
- # or just Release builds.
- if(${BRLCAD_FLAGS_OPTIMIZATION} MATCHES "AUTO")
- if(CMAKE_CONFIGURATION_TYPES)
- if(NOT ENABLE_ALL_CONFIG_TYPES)
- set(opt_conf_list "Release")
- else(NOT ENABLE_ALL_CONFIG_TYPES)
- set(opt_conf_list "Release;RelWithDebInfo;MinSizeRel")
- endif(NOT ENABLE_ALL_CONFIG_TYPES)
- else(CMAKE_CONFIGURATION_TYPES)
- if(${BRLCAD_OPTIMIZED_BUILD} MATCHES "ON")
- set(opt_conf_list "ALL")
- endif(${BRLCAD_OPTIMIZED_BUILD} MATCHES "ON")
- endif(CMAKE_CONFIGURATION_TYPES)
- else(${BRLCAD_FLAGS_OPTIMIZATION} MATCHES "AUTO")
+ # Add optimization flags. If we're a multiconfig build, set up based
+ # on build type. If not, check if BRLCAD_FLAGS_OPTIMIZATION is enabled
+ # or if BRLCAD_OPTIMIZED_BUILD is on.
+ if(CMAKE_CONFIGURATION_TYPES)
+ if(NOT ENABLE_ALL_CONFIG_TYPES)
+ set(opt_conf_list "Release")
+ else(NOT ENABLE_ALL_CONFIG_TYPES)
+ set(opt_conf_list "Release;RelWithDebInfo;MinSizeRel")
+ endif(NOT ENABLE_ALL_CONFIG_TYPES)
+ else(CMAKE_CONFIGURATION_TYPES)
+ if(${BRLCAD_FLAGS_OPTIMIZATION} MATCHES "ON")
+ set(opt_conf_list "ALL")
+ endif(${BRLCAD_FLAGS_OPTIMIZATION} MATCHES "ON")
if(${BRLCAD_OPTIMIZED_BUILD} MATCHES "ON")
set(opt_conf_list "ALL")
endif(${BRLCAD_OPTIMIZED_BUILD} MATCHES "ON")
- endif(${BRLCAD_FLAGS_OPTIMIZATION} MATCHES "AUTO")
+ endif(CMAKE_CONFIGURATION_TYPES)
if(opt_conf_list)
ADD_NEW_FLAG(C OPTIMIZE_C_FLAGS "${opt_conf_list}")
ADD_NEW_FLAG(CXX OPTIMIZE_CXX_FLAGS "${opt_conf_list}")
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
