Revision: 77974
http://sourceforge.net/p/brlcad/code/77974
Author: starseeker
Date: 2020-12-16 14:43:47 +0000 (Wed, 16 Dec 2020)
Log Message:
-----------
Fix logic for when to add optimization flags. Multiconfig builds were never
possible on Linux before Ninja Multi-Config, so this logic was never actually
exercised properly in that mode.
Modified Paths:
--------------
brlcad/trunk/CMakeLists.txt
Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt 2020-12-15 21:06:26 UTC (rev 77973)
+++ brlcad/trunk/CMakeLists.txt 2020-12-16 14:43:47 UTC (rev 77974)
@@ -980,25 +980,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
