Revision: 40551
http://brlcad.svn.sourceforge.net/brlcad/?rev=40551&view=rev
Author: starseeker
Date: 2010-09-13 20:03:53 +0000 (Mon, 13 Sep 2010)
Log Message:
-----------
The macros for src/other are not now being run in the toplevel makefile, so
their changes are not visible there by default - need more CACHE explicit
stuff. Not absolutely clear if all the FORCE options are needed.
Modified Paths:
--------------
brlcad/branches/cmake/CMakeLists.txt
brlcad/branches/cmake/misc/CMake/FindTclPackage.cmake
brlcad/branches/cmake/misc/CMake/ThirdParty.cmake
Modified: brlcad/branches/cmake/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/CMakeLists.txt 2010-09-13 19:06:40 UTC (rev
40550)
+++ brlcad/branches/cmake/CMakeLists.txt 2010-09-13 20:03:53 UTC (rev
40551)
@@ -647,238 +647,8 @@
set_property(CACHE BRLCAD-BUILD_SRC_OTHER PROPERTY STRINGS
"Yes" "No" "Auto")
-#-----------------------------------------------------------------------------
-# Load some CMake macros to handle the special case of third party libraries.
-INCLUDE(${BRLCAD_CMAKE_DIR}/ThirdParty.cmake)
-#---------------------------------------------------------------------------------
-# Optionally Building Local Copies of External Libraries
-#
-# Need to get a bit fancy here - since we want to be able to turn local libs
-# on/off at will, need to be careful about how we handle key variables.
Approach
-# is to stash values in BRLCAD_* prefixed versions, then restore them after
-# the various Find*.cmake commands do their thing. If NOT doing local build,
-# then the BRLCAD_* and standard variables will be the same. It remains to be
-# seen if there will be enough consistency for a macro - the variables that
-# need to be overridden will vary depending on the particular tests made by
each
-# subdirectory's CMake logic.
-#---------------------------------------------------------------------------------
-
-# This is our "heavy hammer" flag - if this is set, assume system for
-# everything. As yet, there is no "automatic" logic to toggle specific
-# libraries on if detection fails, but that may be possible.
-OPTION(BRLCAD_SYSTEM_LIBS_ONLY "Use the system's libraries." OFF)
-OPTION(BRLCAD_BUILD_LOCAL_LIBS "Build all the local copies of libraries." OFF)
-IF(BRLCAD_BUILD_LOCAL_LIBS)
- SET(BRLCAD_SYSTEM_LIBS_ONLY OFF CACHE BOOL "Use the system's
libraries." FORCE)
-ENDIF(BRLCAD_BUILD_LOCAL_LIBS)
-
-# zlib Library
-THIRD_PARTY_OPTION(ZLIB zlib)
-THIRD_PARTY_SUBDIR(ZLIB src/other/libz)
-
-# libtermlib Library
-THIRD_PARTY_OPTION(TERMLIB termlib)
-THIRD_PARTY_SUBDIR(TERMLIB src/other/libtermlib)
-
-# libpng Library - Checks for ZLIB, so need to handle libpng AFTER zlib to set
the variables
-# if using a local copy of zlib. If not using a local copy of zlib, FindZLIB
results will
-# be identical in both cases so there is no danger of harming the libpng
setup. The PNG
-# CMake system needs some options set and some variables translated to fit
BRL-CAD's
-# standard assumptions, so handle that here as well.
-THIRD_PARTY_OPTION(PNG png)
-# BRL-CAD needs PNG's IO - turn it on (i.e. turn off the disabling flags)
-SET(PNG_NO_CONSOLE_IO OFF CACHE BOOL "Option to disable Console IO in PNG"
FORCE)
-MARK_AS_ADVANCED(PNG_NO_CONSOLE_IO)
-SET(PNG_NO_STDIO OFF CACHE BOOL "Option to disable STDIO in PNG" FORCE)
-MARK_AS_ADVANCED(PNG_NO_STDIO)
-THIRD_PARTY_SUBDIR(PNG src/other/libpng)
-IF(BRLCAD_BUILD_LOCAL_PNG)
- # PNG_LIB_NAME doesn't automatically propogate to toplevel due to
scoping of CMake variables -
- # use get_directory_property to recover the value and place it in the
CACHE
- get_directory_property(PNG_LIBRARY DIRECTORY src/other/libpng
DEFINITION PNG_LIB_NAME)
- SET(BRLCAD_PNG_LIBRARY "${PNG_LIBRARY}" CACHE STRING "libpng name for
targets" FORCE)
-ELSE(BRLCAD_BUILD_LOCAL_PNG)
- # The PNG CMake file seems to set PNG_PNG_INCLUDE_DIR rather than
PNG_INCLUDE_DIR, so
- # a generic macro won't pick up the setting - handle it here
- SET(PNG_INCLUDE_DIR ${PNG_PNG_INCLUDE_DIR} CACHE STRING "PNG include
directory" FORCE)
- SET(BRLCAD_PNG_INCLUDE_DIR ${PNG_INCLUDE_DIR} CACHE STRING "PNG include
directory" FORCE)
-ENDIF(BRLCAD_BUILD_LOCAL_PNG)
-
-# libregex Library
-THIRD_PARTY_OPTION(REGEX regex)
-THIRD_PARTY_SUBDIR(REGEX src/other/libregex)
-
-# libutahrle Library - The directory to perform ADD_SUBDIRECTORY on and the
-# include directory for utahrle are different, so override the macro's setting
-# of UTAHRLE_INCLUDE_DIR here.
-THIRD_PARTY_OPTION(UTAHRLE utahrle)
-THIRD_PARTY_SUBDIR(UTAHRLE src/other/libutahrle)
-IF(BRLCAD_BUILD_LOCAL_UTAHRLE)
- SET(UTAHRLE_INCLUDE_DIR
"${BRLCAD_SOURCE_DIR}/src/other/libutahrle/include" CACHE STRING "directory
with rle.h header" FORCE)
- SET(BRLCAD_UTAHRLE_INCLUDE_DIR "${UTAHRLE_INCLUDE_DIR}" CACHE STRING
"directory with rle.h header" FORCE)
-ENDIF(BRLCAD_BUILD_LOCAL_UTAHRLE)
-
-# URTToolkit
-# Programs, not a library - needs libutahrle, but the "check for system
install" logic
-# will be different here. Ignore for now, revisit later.
-ADD_SUBDIRECTORY(src/other/URToolkit)
-
-
-# Tcl/Tk presents a number of complexities for BRL-CAD and CMake - BRL-CAD
requires
-# far more knowledge of the details of a Tcl/Tk installation than most
programs,
-# which unfortunately means the standard FindTCL.cmake is not sufficient.
Rather than
-# use THIRD_PARTY_OPTION here, we will instead provide the option manually and
ensure
-# that BRL-CAD's own FindTCL.cmake file is loaded.
-
-# Set Tcl/Tk requirements for BRL-CAD so FindTCL.cmake knows what to reject
-SET(TCL_PATH_NOMATCH_PATTERNS
"/usr/brlcad;brlcad-install;${CMAKE_INSTALL_PREFIX}" CACHE STRING "Paths to
avoid when looking for tcl/tk" FORCE)
-SET(TCL_MIN_VERSION "8.5" CACHE STRING "Minimum acceptable Tcl/Tk version"
FORCE)
-
-THIRD_PARTY_OPTION(TCL tcl)
-IF(BRLCAD_BUILD_LOCAL_TCL AND TCL_REQUIRE_TK)
- OPTION(BRLCAD_BUILD_LOCAL_TK "Build the local versions of Tcl/Tk" ON)
-ELSE(BRLCAD_BUILD_LOCAL_TCL AND TCL_REQUIRE_TK)
- OPTION(BRLCAD_BUILD_LOCAL_TK "Build the local versions of Tcl/Tk" OFF)
-ENDIF(BRLCAD_BUILD_LOCAL_TCL AND TCL_REQUIRE_TK)
-IF(BRLCAD_BUILD_LOCAL_LIBS)
- SET(BRLCAD_BUILD_LOCAL_TK ON)
-ENDIF(BRLCAD_BUILD_LOCAL_LIBS)
-THIRD_PARTY_AUTOCONF_EXTERNAL_PROJECT(TCL tcl src/other/tcl unix "")
-IF(BRLCAD_BUILD_LOCAL_TCL OR BRLCAD_BUILD_LOCAL_LIBS)
- SET(TCL_LIBRARY
"${BRLCAD_PREFIX}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}tcl8.5${CMAKE_SHARED_LIBRARY_SUFFIX}")
- SET(TCL_INCLUDE_PATH "${BRLCAD_PREFIX}/include")
- SET(TCL_CONF_PREFIX "${BRLCAD_PREFIX}/lib")
-ENDIF(BRLCAD_BUILD_LOCAL_TCL OR BRLCAD_BUILD_LOCAL_LIBS)
-THIRD_PARTY_AUTOCONF_EXTERNAL_PROJECT(TK tk src/other/tk unix
"--with-tcl=${TCL_CONF_PREFIX}")
-IF(BRLCAD_BUILD_LOCAL_TK OR BRLCAD_BUILD_LOCAL_LIBS)
- SET(TK_LIBRARY
"${BRLCAD_PREFIX}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}tk8.5${CMAKE_SHARED_LIBRARY_SUFFIX}")
- SET(TK_INCLUDE_PATH "${BRLCAD_PREFIX}/include")
- SET(TK_CONF_PREFIX "${BRLCAD_PREFIX}/lib")
- ADD_DEPENDENCIES(tk tcl)
-ENDIF(BRLCAD_BUILD_LOCAL_TK OR BRLCAD_BUILD_LOCAL_LIBS)
-
-# Now that Tcl/Tk is settled, define the HAVE_TK flag for the config.h file
-IF(TK_LIBRARY)
- SET(HAVE_TK 1)
- FILE(APPEND ${CONFIG_H_FILE} "#cmakedefine HAVE_TK 1\n")
-ENDIF(TK_LIBRARY)
-
-# Depending on the Tcl/Tk results, look for packages required by BRL-CAD. If
-# building local Tcl/Tk, go ahead and enable all the packages as well -
otherwise,
-# check the found Tcl/Tk and enable what it doesn't supply. If doing a
non-graphical
-# build, only compile extensions that don't use Tk.
-INCLUDE(${BRLCAD_CMAKE_DIR}/FindTclPackage.cmake)
-IF(NOT BRLCAD_BUILD_LOCAL_TCL)
- IF(TCL_TCLSH)
- FIND_TCL_PACKAGE(${TCL_TCLSH} Itcl)
- ENDIF(TCL_TCLSH)
- IF(NOT BRLCAD_BUILD_LOCAL_TK)
- IF(TK_WISH)
- FIND_TCL_PACKAGE(${TK_WISH} Itk)
- FIND_TCL_PACKAGE(${TK_WISH} Iwidgets)
- FIND_TCL_PACKAGE(${TK_WISH} Tkhtml)
- FIND_TCL_PACKAGE(${TK_WISH} tkpng)
- FIND_TCL_PACKAGE(${TK_WISH} Tktable)
- ENDIF(TK_WISH)
- ENDIF(NOT BRLCAD_BUILD_LOCAL_TK)
-ELSE(NOT BRLCAD_BUILD_LOCAL_TCL)
- OPTION(BRLCAD_BUILD_LOCAL_ITCL "Build the local ITCL package" ON)
- IF(BRLCAD_BUILD_LOCAL_TK)
- OPTION(BRLCAD_BUILD_LOCAL_ITK "Build the local ITK package" ON)
- OPTION(BRLCAD_BUILD_LOCAL_IWIDGETS "Build the local IWIDGETS
package" ON)
- OPTION(BRLCAD_BUILD_LOCAL_TKHTML "Build the local TKHTML
package" ON)
- OPTION(BRLCAD_BUILD_LOCAL_TKPNG "Build the local TKPNG package"
ON)
- OPTION(BRLCAD_BUILD_LOCAL_TKTABLE "Build the local TKTABLE
package" ON)
- ENDIF(BRLCAD_BUILD_LOCAL_TK)
-ENDIF(NOT BRLCAD_BUILD_LOCAL_TCL)
-
-# Handle Tcl/Tk packages
-THIRD_PARTY_AUTOCONF_EXTERNAL_PROJECT(ITCL itcl src/other/incrTcl/itcl ""
"--with-tcl=${TCL_CONF_PREFIX}")
-IF(BRLCAD_BUILD_LOCAL_TCL)
- ADD_DEPENDENCIES(itcl tcl)
-ENDIF(BRLCAD_BUILD_LOCAL_TCL)
-IF(BRLCAD_BUILD_LOCAL_ITCL)
- SET(ITCL_VERSION "3.4")
-ENDIF(BRLCAD_BUILD_LOCAL_ITCL)
-FILE(APPEND ${CONFIG_H_FILE} "#cmakedefine ITCL_VERSION
\"${ITCL_VERSION}\"\n")
-
-THIRD_PARTY_AUTOCONF_EXTERNAL_PROJECT(ITK itk src/other/incrTcl/itk ""
"--with-tcl=${TCL_CONF_PREFIX};--with-tk=${TK_CONF_PREFIX}")
-IF(BRLCAD_BUILD_LOCAL_TK)
- ADD_DEPENDENCIES(itk itcl tcl tk)
-ENDIF(BRLCAD_BUILD_LOCAL_TK)
-IF(BRLCAD_BUILD_LOCAL_ITK)
- SET(ITK_VERSION "3.3")
-ENDIF(BRLCAD_BUILD_LOCAL_ITK)
-FILE(APPEND ${CONFIG_H_FILE} "#cmakedefine ITK_VERSION \"${ITK_VERSION}\"\n")
-
-IF(BRLCAD_BUILD_LOCAL_ITCL OR BRLCAD_BUILD_LOCAL_ITK)
- SET(BRLCAD_BUILD_LOCAL_INCRTCL ON)
-ENDIF(BRLCAD_BUILD_LOCAL_ITCL OR BRLCAD_BUILD_LOCAL_ITK)
-
-THIRD_PARTY_AUTOCONF_EXTERNAL_PROJECT(IWIDGETS iwidgets
src/other/incrTcl/iwidgets ""
"--with-tcl=${TCL_CONF_PREFIX};--with-tk=${TK_CONF_PREFIX};--with-itcl=${BRLCAD_SOURCE_DIR}/src/other/incrTcl")
-IF(BRLCAD_BUILD_LOCAL_ITK)
- ADD_DEPENDENCIES(iwidgets tcl tk itcl itk)
- SET(IWIDGETS_VERSION "4.0.1")
-ENDIF(BRLCAD_BUILD_LOCAL_ITK)
-FILE(APPEND ${CONFIG_H_FILE} "#define IWIDGETS_VERSION
\"${IWIDGETS_VERSION}\"\n")
-
-THIRD_PARTY_AUTORECONF_EXTERNAL_PROJECT(TKHTML tkhtml src/other/tkhtml ""
"--with-tcl=${TCL_CONF_PREFIX};--with-tk=${TK_CONF_PREFIX}")
-IF(BRLCAD_BUILD_LOCAL_TK)
- ADD_DEPENDENCIES(tkhtml tk tcl)
-ENDIF(BRLCAD_BUILD_LOCAL_TK)
-
-THIRD_PARTY_AUTOCONF_EXTERNAL_PROJECT(TKPNG tkpng src/other/tkpng ""
"--with-tcl=${TCL_CONF_PREFIX};--with-tk=${TK_CONF_PREFIX}")
-IF(BRLCAD_BUILD_LOCAL_TK)
- ADD_DEPENDENCIES(tkpng tk tcl)
-ENDIF(BRLCAD_BUILD_LOCAL_TK)
-
-THIRD_PARTY_AUTOCONF_EXTERNAL_PROJECT(TKTABLE tktable src/other/tktable ""
"--with-tcl=${TCL_CONF_PREFIX};--with-tk=${TK_CONF_PREFIX}")
-IF(BRLCAD_BUILD_LOCAL_TK)
- ADD_DEPENDENCIES(tktable tk tcl)
-ENDIF(BRLCAD_BUILD_LOCAL_TK)
-
-
-# OpenNURBS Library
-THIRD_PARTY_OPTION(OPENNURBS openNURBS)
-THIRD_PARTY_SUBDIR(OPENNURBS src/other/openNURBS)
-
-# STEP Class Libraries
-THIRD_PARTY_OPTION(SCL scl)
-THIRD_PARTY_SUBDIR(SCL src/other/step)
-IF(BRLCAD_BUILD_LOCAL_SCL)
- SET(BRLCAD_SCL_INCLUDE_DIR
"${BRLCAD_SOURCE_DIR}/src/other/step/include" CACHE STRING "Directory
containing SCL headers" FORCE)
- SET(BRLCAD_SCL_EXPRESS_EXECUTABLE "express" CACHE STRING "SCL express
binary" FORCE)
- SET(BRLCAD_SCL_SYMLINK_EXECUTABLE "symlink" CACHE STRING "SCL symlink
binary" FORCE)
- SET(BRLCAD_SCL_EXPPP_EXECUTABLE "exppp" CACHE STRING "SCL exppp binary"
FORCE)
- SET(BRLCAD_SCL_FEDEX_OS_EXECUTABLE "fedex_os" CACHE STRING "SCL
fedex_os binary" FORCE)
- SET(BRLCAD_SCL_FEDEX_IDL_EXECUTABLE "fedex_idl" CACHE STRING "SCL
fedex_idl binary" FORCE)
- SET(BRLCAD_SCL_FEDEX_PLUS_EXECUTABLE "fedex_plus" CACHE STRING "SCL
fedex_plus binary" FORCE)
- SET(BRLCAD_SCL_EXPPP_LIB "libexppp" CACHE STRING "SCL exppp library"
FORCE)
- SET(BRLCAD_SCL_CORE_LIB "stepcore" CACHE STRING "SCL core library"
FORCE)
- SET(BRLCAD_SCL_UTILS_LIB "steputils" CACHE STRING "SCL utilities
library" FORCE)
- SET(BRLCAD_SCL_DAI_LIB "stepdai" CACHE STRING "SCL DAI library" FORCE)
- SET(BRLCAD_SCL_EDITOR_LIB "stepeditor" CACHE STRING "SCL editor
library" FORCE)
-ELSE(BRLCAD_BUILD_LOCAL_SCL)
- SET(BRLCAD_SCL_INCLUDE_DIR "${SCL_INCLUDE_DIR}" CACHE STRING "Directory
containing SCL headers" FORCE)
- SET(BRLCAD_SCL_EXPRESS_EXECUTABLE "${SCL_EXPRESS_EXECUTABLE}" CACHE
STRING "SCL express binary" FORCE)
- SET(BRLCAD_SCL_SYMLINK_EXECUTABLE "${SCL_SYMLINK_EXECUTABLE}" CACHE
STRING "SCL symlink binary" FORCE)
- SET(BRLCAD_SCL_EXPPP_EXECUTABLE "${SCL_EXPPP_EXECUTABLE}" CACHE STRING
"SCL exppp binary" FORCE)
- SET(BRLCAD_SCL_FEDEX_OS_EXECUTABLE "${SCL_FEDEX_OS_EXECUTABLE}" CACHE
STRING "SCL fedex_os binary" FORCE)
- SET(BRLCAD_SCL_FEDEX_IDL_EXECUTABLE "${SCL_FEDEX_IDL_EXECUTABLE}" CACHE
STRING "SCL fedex_idl binary" FORCE)
- SET(BRLCAD_SCL_FEDEX_PLUS_EXECUTABLE "${SCL_FEDEX_PLUS_EXECUTABLE}"
CACHE STRING "SCL fedex_plus binary" FORCE)
- SET(BRLCAD_SCL_EXPPP_LIB "${SCL_EXPPP_LIB}" CACHE STRING "SCL exppp
library" FORCE)
- SET(BRLCAD_SCL_CORE_LIB "${SCL_CORE_LIB}" CACHE STRING "SCL core
library" FORCE)
- SET(BRLCAD_SCL_UTILS_LIB "${SCL_UTILS_LIB}" CACHE STRING "SCL utilities
library" FORCE)
- SET(BRLCAD_SCL_DAI_LIB "${SCL_DAI_LIB}" CACHE STRING "SCL DAI library"
FORCE)
- SET(BRLCAD_SCL_EDITOR_LIB "${SCL_EDITOR_LIB}" CACHE STRING "SCL editor
library" FORCE)
-ENDIF(BRLCAD_BUILD_LOCAL_SCL)
-
-# The jama/tnt headers are installed by default - BRL-CAD requires the altered
headers
-# to build (I think?)
-ADD_SUBDIRECTORY(src/other/tnt)
-
# If building extra docs, need to look for XSLTPROC
if (BRLCAD-BUILD_EXTRADOCS)
INCLUDE(${BRLCAD_CMAKE_DIR}/FindXSLT.cmake)
@@ -901,9 +671,6 @@
# a Bourne shell or something compatible.
INCLUDE(${BRLCAD_CMAKE_DIR}/FindSH.cmake)
-# Now that all the tests are done, configure the brlcad_config.h file:
-configure_file(${CONFIG_H_FILE} ${BRLCAD_BINARY_DIR}/include/brlcad_config.h)
-
# Virtually all of the BRL-CAD code needs the BRL-CAD include directories
# and a couple of standard defines - set those up in variables now - the
# idea being that if any other system-wide defines or include are needed
@@ -911,55 +678,7 @@
SET(BRLCAD_STD_DEFS "-DHAVE_CONFIG_H;-DBRLCADBUILD=1")
SET(BRLCAD_STD_INCLUDES
"${BRLCAD_BINARY_DIR}/include;${BRLCAD_SOURCE_DIR}/include")
-ADD_SUBDIRECTORY(src/libbu)
-ADD_SUBDIRECTORY(src/libbn)
-ADD_SUBDIRECTORY(src/libsysv)
-ADD_SUBDIRECTORY(src/librt)
-#ADD_SUBDIRECTORY(src/external)
-ADD_SUBDIRECTORY(src/libpkg)
-ADD_SUBDIRECTORY(src/libfb)
-ADD_SUBDIRECTORY(src/libwdb)
-ADD_SUBDIRECTORY(src/libgcv)
-ADD_SUBDIRECTORY(src/libanalyze)
-ADD_SUBDIRECTORY(src/libged)
-ADD_SUBDIRECTORY(src/liboptical)
-ADD_SUBDIRECTORY(src/liborle)
-ADD_SUBDIRECTORY(src/libcursor)
-ADD_SUBDIRECTORY(src/conv)
-ADD_SUBDIRECTORY(src/fbserv)
-ADD_SUBDIRECTORY(src/rt)
-ADD_SUBDIRECTORY(src/librtserver)
-ADD_SUBDIRECTORY(src/libdm)
-ADD_SUBDIRECTORY(src/libfft)
-ADD_SUBDIRECTORY(src/libicv)
-ADD_SUBDIRECTORY(src/libmultispectral)
-ADD_SUBDIRECTORY(src/libtclcad)
-ADD_SUBDIRECTORY(src/libtermio)
-ADD_SUBDIRECTORY(src/adrt)
-ADD_SUBDIRECTORY(src/anim)
-ADD_SUBDIRECTORY(src/brlman)
-ADD_SUBDIRECTORY(src/burst)
-ADD_SUBDIRECTORY(src/bwish)
-ADD_SUBDIRECTORY(src/canon)
-ADD_SUBDIRECTORY(src/fb)
-ADD_SUBDIRECTORY(src/vfont)
-ADD_SUBDIRECTORY(src/fbed)
-ADD_SUBDIRECTORY(src/gtools)
-ADD_SUBDIRECTORY(src/halftone)
-ADD_SUBDIRECTORY(src/irprep)
-ADD_SUBDIRECTORY(src/lgt)
-ADD_SUBDIRECTORY(src/mged)
-ADD_SUBDIRECTORY(src/archer)
-ADD_SUBDIRECTORY(src/nirt)
-ADD_SUBDIRECTORY(src/proc-db)
-ADD_SUBDIRECTORY(src/remrt)
-ADD_SUBDIRECTORY(src/rttherm)
-ADD_SUBDIRECTORY(src/shapes)
-ADD_SUBDIRECTORY(src/sig)
-ADD_SUBDIRECTORY(src/tab)
-ADD_SUBDIRECTORY(src/tclscripts)
-ADD_SUBDIRECTORY(src/util)
-ADD_SUBDIRECTORY(src/vdeck)
+ADD_SUBDIRECTORY(src)
ADD_SUBDIRECTORY(db)
ADD_SUBDIRECTORY(include)
ADD_SUBDIRECTORY(doc)
@@ -968,6 +687,9 @@
ADD_SUBDIRECTORY(pix)
ADD_SUBDIRECTORY(bench)
+# Now that all the tests are done, configure the brlcad_config.h file:
+configure_file(${CONFIG_H_FILE} ${BRLCAD_BINARY_DIR}/include/brlcad_config.h)
+
# Now that everything is configured, print a summary of the build settings.
This is a bit complicated, but
# the basic idea is to print labels, "smart" spacers around those labels to
line everything up, and the
# value of the appropriate build variable. The convention is to assign the
text labeling each value to a
Modified: brlcad/branches/cmake/misc/CMake/FindTclPackage.cmake
===================================================================
--- brlcad/branches/cmake/misc/CMake/FindTclPackage.cmake 2010-09-13
19:06:40 UTC (rev 40550)
+++ brlcad/branches/cmake/misc/CMake/FindTclPackage.cmake 2010-09-13
20:03:53 UTC (rev 40551)
@@ -19,9 +19,12 @@
STRING(REGEX REPLACE "\n" "" ${PKGNAME_UPPER}_PACKAGE_VERSION ${pkgversion})
IF(${PKGNAME_UPPER}_PACKAGE_VERSION)
OPTION(${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${PKGNAME_UPPER}
"Build the local ${packagename} library" ON)
+ SET(${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${PKGNAME_UPPER} ON CACHE
BOOL "Build the local ${packagename} library" FORCE)
ELSE(${PKGNAME_UPPER}_PACKAGE_VERSION)
OPTION(${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${PKGNAME_UPPER}
"Build the local ${packagename} library" OFF)
+ SET(${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${PKGNAME_UPPER} OFF
CACHE BOOL "Build the local ${packagename} library" FORCE)
ENDIF(${PKGNAME_UPPER}_PACKAGE_VERSION)
+ SET(${PKGNAME_UPPER}_PACKAGE_VERSION
${${PKGNAME_UPPER}_PACKAGE_VERSION} CACHE STRING
"${PKGNAME_UPPER}_PACKAGE_VERSION" FORCE)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(${PKGNAME_UPPER} DEFAULT_MSG
${PKGNAME_UPPER}_PACKAGE_VERSION)
MARK_AS_ADVANCED(
${PKGNAME_UPPER}_PACKAGE_VERSION
Modified: brlcad/branches/cmake/misc/CMake/ThirdParty.cmake
===================================================================
--- brlcad/branches/cmake/misc/CMake/ThirdParty.cmake 2010-09-13 19:06:40 UTC
(rev 40550)
+++ brlcad/branches/cmake/misc/CMake/ThirdParty.cmake 2010-09-13 20:03:53 UTC
(rev 40551)
@@ -2,15 +2,15 @@
MACRO(THIRD_PARTY_OPTION upper lower)
IF(${CMAKE_PROJECT_NAME}_BUILD_LOCAL_LIBS)
OPTION(${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${upper} "Build the
local ${upper} library." ON)
- SET(${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${upper} ON)
+ SET(${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${upper} ON CACHE BOOL
"Build the local ${upper} library." FORCE)
ELSE(${CMAKE_PROJECT_NAME}_BUILD_LOCAL_LIBS)
OPTION(${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${upper} "Build the
local ${upper} library." OFF)
- SET(${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${upper} OFF)
+ SET(${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${upper} OFF CACHE BOOL
"Build the local ${upper} library." FORCE)
ENDIF(${CMAKE_PROJECT_NAME}_BUILD_LOCAL_LIBS)
IF(NOT ${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${upper} OR
${CMAKE_PROJECT_NAME}_SYSTEM_LIBS_ONLY)
- SET(${upper}_FOUND "${upper}-NOTFOUND")
- SET(${upper}_LIBRARY "${upper}-NOTFOUND")
- SET(${upper}_INCLUDE_DIR "${upper}-NOTFOUND")
+ SET(${upper}_FOUND "${upper}-NOTFOUND" CACHE STRING
"${upper}_FOUND" FORCE)
+ SET(${upper}_LIBRARY "${upper}-NOTFOUND" CACHE STRING
"${upper}_LIBRARY" FORCE)
+ SET(${upper}_INCLUDE_DIR "${upper}-NOTFOUND" CACHE STRING
"${upper}_INCLUDE_DIR" FORCE)
IF(EXISTS ${${CMAKE_PROJECT_NAME}_CMAKE_DIR}/Find${upper}.cmake)
INCLUDE(${${CMAKE_PROJECT_NAME}_CMAKE_DIR}/Find${upper}.cmake)
ELSE(EXISTS
${${CMAKE_PROJECT_NAME}_CMAKE_DIR}/Find${upper}.cmake)
@@ -21,7 +21,7 @@
SET(${CMAKE_PROJECT_NAME}_${upper}_LIBRARY
${${upper}_LIBRARY} CACHE STRING "set by THIRD_PARTY macro" FORCE)
ELSE(${upper}_FOUND)
IF(NOT ${CMAKE_PROJECT_NAME}_SYSTEM_LIBS_ONLY)
- SET(${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${upper}
ON)
+ SET(${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${upper}
ON CACHE BOOL "Build the local ${upper} library." FORCE)
SET(${upper}_LIBRARY "${lower}" CACHE STRING
"set by THIRD_PARTY macro" FORCE)
SET(${CMAKE_PROJECT_NAME}_${upper}_LIBRARY
${${upper}_LIBRARY} CACHE STRING "set by THIRD_PARTY macro" FORCE)
ENDIF(NOT ${CMAKE_PROJECT_NAME}_SYSTEM_LIBS_ONLY)
@@ -37,7 +37,7 @@
MACRO(THIRD_PARTY_SUBDIR upper lower)
IF(${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${upper} AND NOT
${CMAKE_PROJECT_NAME}_SYSTEM_LIBS_ONLY)
ADD_SUBDIRECTORY(${lower})
- SET(${upper}_INCLUDE_DIR
${${CMAKE_PROJECT_NAME}_SOURCE_DIR}/${lower} CACHE STRING "set by
THIRD_PARTY_SUBDIR macro" FORCE)
+ SET(${upper}_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/${lower}
CACHE STRING "set by THIRD_PARTY_SUBDIR macro" FORCE)
SET(${CMAKE_PROJECT_NAME}_${upper}_INCLUDE_DIR
${${upper}_INCLUDE_DIR} CACHE STRING "set by THIRD_PARTY_SUBDIR macro" FORCE)
ENDIF(${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${upper} AND NOT
${CMAKE_PROJECT_NAME}_SYSTEM_LIBS_ONLY)
ENDMACRO(THIRD_PARTY_SUBDIR)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
