Revision: 45968
http://brlcad.svn.sourceforge.net/brlcad/?rev=45968&view=rev
Author: starseeker
Date: 2011-08-13 06:54:39 +0000 (Sat, 13 Aug 2011)
Log Message:
-----------
Key the static lib building on the build type. Exposed a problem with making
the trigger variable an OPTION in sub-builds - doing so forces the setting into
the cache and makes it impractical for the AUTO_OPTION macro to do its thing.
Fortunately, the only files doing that were the ones we wrote - corrected them,
and we're good to go.
Modified Paths:
--------------
brlcad/trunk/CMakeLists.txt
brlcad/trunk/src/other/incrTcl/itcl/CMakeLists.txt
brlcad/trunk/src/other/incrTcl/itk/CMakeLists.txt
brlcad/trunk/src/other/openNURBS/CMakeLists.txt
brlcad/trunk/src/other/step/CMakeLists.txt
brlcad/trunk/src/other/tcl/CMakeLists.txt
brlcad/trunk/src/other/tk/CMakeLists.txt
Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt 2011-08-13 06:33:24 UTC (rev 45967)
+++ brlcad/trunk/CMakeLists.txt 2011-08-13 06:54:39 UTC (rev 45968)
@@ -570,21 +570,10 @@
OPTION(BUILD_SHARED_LIBS "Build shared libraries" ON)
MARK_AS_ADVANCED(BUILD_SHARED_LIBS)
-# Build static libs by default. Standard practice is to build and
-# install both dynamic and static versions of libraries. This option
-# is off by default in Debug configuration. Note that turning this
-# option off will not disable libraries specifically added as STATIC
-IF(CMAKE_BUILD_TYPE)
- # If we're doing a debug build, don't build the static libs unless
- # they're specifically asked for (i.e. there is a situation where
- # the developer wants to look into the static libs specifically.
- # Note that this won't turn off libs that are built ONLY as static
- IF ("${CMAKE_BUILD_TYPE}" MATCHES "Debug")
- OPTION(BUILD_STATIC_LIBS "Build static libraries" OFF)
- ENDIF ("${CMAKE_BUILD_TYPE}" MATCHES "Debug")
-ELSE(CMAKE_BUILD_TYPE)
- OPTION(BUILD_STATIC_LIBS "Build static libraries" ON)
-ENDIF(CMAKE_BUILD_TYPE)
+# Build static libs by default unless we're debugging. Note: this
+# option will not disable libraries specifically added as STATIC even
+# when OFF.
+AUTO_OPTION(BRLCAD_BUILD_STATIC BUILD_STATIC_LIBS "OFF" "ON")
# Turn on librtserver build.
OPTION(BRLCAD-ENABLE_RTSERVER "Enable the librtserver target." ON)
Modified: brlcad/trunk/src/other/incrTcl/itcl/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/incrTcl/itcl/CMakeLists.txt 2011-08-13 06:33:24 UTC
(rev 45967)
+++ brlcad/trunk/src/other/incrTcl/itcl/CMakeLists.txt 2011-08-13 06:54:39 UTC
(rev 45968)
@@ -70,10 +70,10 @@
ENDIF(TCL_SRC_PREFIX AND TCL_BIN_PREFIX)
# build shared libs by default
-OPTION(BUILD_SHARED_LIBS "Build shared libraries" ON)
+SET(BUILD_SHARED_LIBS ON)
# build static libs by default
-OPTION(BUILD_STATIC_LIBS "Build static libraries" ON)
+SET(BUILD_STATIC_LIBS ON)
# version numbers
SET(ITCL_MAJOR_VERSION 3)
Modified: brlcad/trunk/src/other/incrTcl/itk/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/incrTcl/itk/CMakeLists.txt 2011-08-13 06:33:24 UTC
(rev 45967)
+++ brlcad/trunk/src/other/incrTcl/itk/CMakeLists.txt 2011-08-13 06:54:39 UTC
(rev 45968)
@@ -85,10 +85,10 @@
ENDIF(TCL_SRC_PREFIX AND TCL_BIN_PREFIX AND ITCL_SRC_PREFIX AND
ITCL_BIN_PREFIX AND TK_SRC_PREFIX AND TK_BIN_PREFIX)
# build shared libs by default
-OPTION(BUILD_SHARED_LIBS "Build shared libraries" ON)
+SET(BUILD_SHARED_LIBS ON)
# build static libs by default
-OPTION(BUILD_STATIC_LIBS "Build static libraries" ON)
+SET(BUILD_STATIC_LIBS ON)
# version numbers
SET(ITK_MAJOR_VERSION 3)
Modified: brlcad/trunk/src/other/openNURBS/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/openNURBS/CMakeLists.txt 2011-08-13 06:33:24 UTC
(rev 45967)
+++ brlcad/trunk/src/other/openNURBS/CMakeLists.txt 2011-08-13 06:54:39 UTC
(rev 45968)
@@ -1,8 +1,8 @@
# build shared libs by default
-OPTION(BUILD_SHARED_LIBS "Build shared libraries" ON)
+set(BUILD_SHARED_LIBS ON)
# build static libs by default
-OPTION(BUILD_STATIC_LIBS "Build static libraries" ON)
+set(BUILD_STATIC_LIBS ON)
set(OPENNURBS_SOURCES
opennurbs_3dm_attributes.cpp
Modified: brlcad/trunk/src/other/step/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/step/CMakeLists.txt 2011-08-13 06:33:24 UTC (rev
45967)
+++ brlcad/trunk/src/other/step/CMakeLists.txt 2011-08-13 06:54:39 UTC (rev
45968)
@@ -49,10 +49,10 @@
PROJECT(SCL)
# build shared libs by default
-OPTION(BUILD_SHARED_LIBS "Build shared libraries" ON)
+set(BUILD_SHARED_LIBS ON)
# build static libs by default
-OPTION(BUILD_STATIC_LIBS "Build static libraries" ON)
+set(BUILD_STATIC_LIBS ON)
# Set version
SET(SCL_VERSION_MAJOR "3")
Modified: brlcad/trunk/src/other/tcl/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/tcl/CMakeLists.txt 2011-08-13 06:33:24 UTC (rev
45967)
+++ brlcad/trunk/src/other/tcl/CMakeLists.txt 2011-08-13 06:54:39 UTC (rev
45968)
@@ -46,10 +46,10 @@
PROJECT(TCL)
# build shared libs by default
-OPTION(BUILD_SHARED_LIBS "Build shared libraries" ON)
+set(BUILD_SHARED_LIBS ON)
# build static libs by default
-OPTION(BUILD_STATIC_LIBS "Build static libraries" ON)
+set(BUILD_STATIC_LIBS ON)
# version numbers
SET(TCL_VERSION_MAJOR 8)
Modified: brlcad/trunk/src/other/tk/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/tk/CMakeLists.txt 2011-08-13 06:33:24 UTC (rev
45967)
+++ brlcad/trunk/src/other/tk/CMakeLists.txt 2011-08-13 06:54:39 UTC (rev
45968)
@@ -71,10 +71,10 @@
# build shared libs by default
-OPTION(BUILD_SHARED_LIBS "Build shared libraries" ON)
+set(BUILD_SHARED_LIBS ON)
# build static libs by default
-OPTION(BUILD_STATIC_LIBS "Build static libraries" ON)
+set(BUILD_STATIC_LIBS ON)
# version numbers
SET(TK_VERSION_MAJOR 8)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
FREE DOWNLOAD - uberSVN with Social Coding for Subversion.
Subversion made easy with a complete admin console. Easy
to use, easy to manage, easy to install, easy to extend.
Get a Free download of the new open ALM Subversion platform now.
http://p.sf.net/sfu/wandisco-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
