Revision: 70048 http://sourceforge.net/p/brlcad/code/70048 Author: starseeker Date: 2017-08-04 02:22:43 +0000 (Fri, 04 Aug 2017) Log Message: ----------- convert one of the AUTO_OPTION macro uses to cmake_dependent_option. The other one is a bit tricker, as it's bound up with the compiler flag logic, but the long term goal is to eliminate AUTO_OPTION in favor of built-in CMake functionality.
Modified Paths: -------------- brlcad/trunk/CMakeLists.txt Modified: brlcad/trunk/CMakeLists.txt =================================================================== --- brlcad/trunk/CMakeLists.txt 2017-08-03 23:33:49 UTC (rev 70047) +++ brlcad/trunk/CMakeLists.txt 2017-08-04 02:22:43 UTC (rev 70048) @@ -1052,14 +1052,7 @@ # 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". -if(NOT CMAKE_CONFIGURATION_TYPES) - AUTO_OPTION(BRLCAD_BUILD_STATIC_LIBS BUILD_STATIC_LIBS "OFF" "ON") -else(NOT CMAKE_CONFIGURATION_TYPES) - if("${BRLCAD_BUILD_STATIC_LIBS}" STREQUAL "") - set(BRLCAD_BUILD_STATIC_LIBS ON) - endif("${BRLCAD_BUILD_STATIC_LIBS}" STREQUAL "") - set(BUILD_STATIC_LIBS "${BRLCAD_BUILD_STATIC_LIBS}") -endif(NOT CMAKE_CONFIGURATION_TYPES) +cmake_dependent_option(BUILD_STATIC_LIBS "Build static libraries" ON " ( NOT \"${CMAKE_CONFIGURATION_TYPES}\" STREQUAL \"\" ) OR ( NOT \"${CMAKE_BUILD_TYPE}\" 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