Revision: 70054
http://sourceforge.net/p/brlcad/code/70054
Author: starseeker
Date: 2017-08-07 15:37:54 +0000 (Mon, 07 Aug 2017)
Log Message:
-----------
simplify test
Modified Paths:
--------------
brlcad/trunk/CMakeLists.txt
Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt 2017-08-07 15:24:23 UTC (rev 70053)
+++ brlcad/trunk/CMakeLists.txt 2017-08-07 15:37:54 UTC (rev 70054)
@@ -1078,7 +1078,12 @@
# option will not disable libraries specifically added as STATIC even
# when OFF. For multi-configuration options the build type determination
# is made at build time, so just default to "ON".
-cmake_dependent_option(BUILD_STATIC_LIBS "Build static libraries" ON " ( NOT
\"${CMAKE_CONFIGURATION_TYPES}\" STREQUAL \"\" ) OR ( NOT
\"${CMAKE_BUILD_TYPE}\" STREQUAL \"Debug\" ) " OFF)
+if(NOT CMAKE_BUILD_TYPE)
+ set(CBT "MULTICONFIG")
+else(NOT CMAKE_BUILD_TYPE)
+ set(CBT "${CMAKE_BUILD_TYPE}")
+endif(NOT CMAKE_BUILD_TYPE)
+cmake_dependent_option(BUILD_STATIC_LIBS "Build static libraries" ON
"CMAKE_CONFIGURATION_TYPES OR NOT ${CBT} STREQUAL Debug" OFF)
# On Mac OS X, it is common to have third party package managers
# present for easy software installation (currently we're aware of
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
