Revision: 55877
http://sourceforge.net/p/brlcad/code/55877
Author: starseeker
Date: 2013-06-27 13:49:22 +0000 (Thu, 27 Jun 2013)
Log Message:
-----------
More tweaks for CMake GUI manipulation of values
Modified Paths:
--------------
brlcad/trunk/CMakeLists.txt
brlcad/trunk/src/other/CMakeLists.txt
Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt 2013-06-27 13:42:18 UTC (rev 55876)
+++ brlcad/trunk/CMakeLists.txt 2013-06-27 13:49:22 UTC (rev 55877)
@@ -168,7 +168,7 @@
endif(NOT BRLCAD_ROOT_OVERRIDE)
endif(BRLCAD_ROOT)
if(NOT BRLCAD_ROOT_OVERRIDE)
- if(BRLCAD_ROOT STREQUAL "/usr" OR ${CMAKE_INSTALL_PREFIX} STREQUAL "/usr")
+ if(BRLCAD_ROOT STREQUAL "/usr" OR "${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr")
message(WARNING "}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}\nIt is
STRONGLY recommended that you DO NOT install BRL-CAD into /usr as BRL-CAD
provides several libraries that may conflict with other libraries (e.g. librt,
libbu, libbn) on certain system configurations.\nSince our libraries predate
all those that we're known to conflict with and are at the very core of our
geometry services and project heritage, we have no plans to change the names of
our libraries at this time.\nINSTALLING INTO /usr CAN MAKE A SYSTEM COMPLETELY
UNUSABLE. If you choose to continue installing into /usr, you do so entirely
at your own risk. You have been
warned.\n}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}")
if(SLEEP_EXEC)
message("Pausing 15 seconds...")
@@ -177,7 +177,7 @@
if(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr")
message(FATAL_ERROR "If you wish to proceed using /usr as your prefix,
define BRLCAD_ROOT_OVERRIDE=1 for CMake")
endif(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr")
- endif(BRLCAD_ROOT STREQUAL "/usr" OR ${CMAKE_INSTALL_PREFIX} STREQUAL "/usr")
+ endif(BRLCAD_ROOT STREQUAL "/usr" OR "${CMAKE_INSTALL_PREFIX}" STREQUAL
"/usr")
endif(NOT BRLCAD_ROOT_OVERRIDE)
# While we're at it, complain if BRLCAD_DATA is set
@@ -584,7 +584,7 @@
#---------------------------------------------------------------------
-# Normalize the build type capitalization and handle NONE case
+# Normalize the build type capitalization
if(CMAKE_BUILD_TYPE)
string(TOUPPER "${CMAKE_BUILD_TYPE}" BUILD_TYPE_UPPER)
if ("${BUILD_TYPE_UPPER}" STREQUAL "RELEASE")
@@ -594,6 +594,11 @@
set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Build Type" FORCE)
endif ("${BUILD_TYPE_UPPER}" STREQUAL "DEBUG")
endif(CMAKE_BUILD_TYPE)
+# Stash the build type so we can set up a drop-down menu in the gui
+if(NOT BRLCAD_IS_SUBBUILD)
+ set(CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING "BRL-CAD high level
build configuration")
+ set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "" Debug Release)
+endif(NOT BRLCAD_IS_SUBBUILD)
#---------------------------------------------------------------------
# The location in which to install BRL-CAD. Only do this if
@@ -1090,6 +1095,7 @@
# Enable features requiring Qt
find_package(Qt5Widgets QUIET)
option(BRLCAD_ENABLE_QT "Enable features requiring Qt" OFF)
+mark_as_advanced(BRLCAD_ENABLE_QT)
if(Qt5Widgets_FOUND)
set(BRLCAD_ENABLE_QT ON)
endif(Qt5Widgets_FOUND)
@@ -2237,6 +2243,8 @@
mark_as_advanced(CMAKE_BACKWARDS_COMPATIBILITY)
mark_as_advanced(EXECUTABLE_OUTPUT_PATH)
mark_as_advanced(LIBRARY_OUTPUT_PATH)
+mark_as_advanced(CMAKE_CXX_COMPILER)
+mark_as_advanced(CMAKE_C_COMPILER)
# ----------------------------------------------------------------------------
# If options have been defined that we are going to document, by now they've
Modified: brlcad/trunk/src/other/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/CMakeLists.txt 2013-06-27 13:42:18 UTC (rev
55876)
+++ brlcad/trunk/src/other/CMakeLists.txt 2013-06-27 13:49:22 UTC (rev
55877)
@@ -798,6 +798,8 @@
responsive to the toplevel BRLCAD_BUNDLED_LIBS option and testing
first for a system version if BRLCAD_BUNDLED_LIBS is also AUTO.
")
+set(IS_SUBBUILD_STASH ${IS_SUBBUILD})
+set(IS_SUBBUILD ON)
THIRD_PARTY(scl step "LEMON_EXECUTABLE;PERPLEX_EXECUTABLE;BRLCAD_LEVEL3"
scl_ALIASES scl_DESCRIPTION NOSYS)
if(BRLCAD_SCL_BUILD)
set(FEDEX_PLUS_EXEC fedex_plus CACHE STRING "Fedex plus executable" FORCE)
@@ -807,6 +809,7 @@
DISTCLEAN(${CMAKE_CURRENT_BINARY_DIR}/step/include/scl_cf.h.in)
DISTCLEAN(${CMAKE_CURRENT_BINARY_DIR}/step/scl_version_string.h.txt)
endif(BRLCAD_SCL_BUILD)
+set(IS_SUBBUILD ${IS_SUBBUILD_STASH})
mark_as_advanced(SCL_BUILD_TYPE)
mark_as_advanced(SCL_GENERATE_LEXER_PARSER)
mark_as_advanced(SCL_BUILD_SHARED_LIBS)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
