Revision: 45980
http://brlcad.svn.sourceforge.net/brlcad/?rev=45980&view=rev
Author: starseeker
Date: 2011-08-15 02:01:11 +0000 (Mon, 15 Aug 2011)
Log Message:
-----------
Oops - variables changed, so update conditionals that use them...
Modified Paths:
--------------
brlcad/trunk/src/other/CMakeLists.txt
Modified: brlcad/trunk/src/other/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/CMakeLists.txt 2011-08-15 01:25:24 UTC (rev
45979)
+++ brlcad/trunk/src/other/CMakeLists.txt 2011-08-15 02:01:11 UTC (rev
45980)
@@ -90,19 +90,18 @@
#Only on WIN32 will the combination of the build search tests and
#libtermlib fail to find a valid term, so set variables accordingly
IF(NOT WIN32)
- SET(HAVE_TERMLIB 1 CACHE BOOL "Have some termlib" FORCE)
+ SET(HAVE_TERMLIB 1 CACHE BOOL "Have some termlib" FORCE)
ELSE(NOT WIN32)
- SET(BRLCAD_BUILD_LOCAL_TERMLIB_FORCE_OFF ON CACHE BOOL "Disable
libtermlib build." FORCE)
- MARK_AS_ADVANCED(BRLCAD_BUILD_LOCAL_TERMLIB_FORCE_OFF)
- SET(HAVE_TERMLIB 0 CACHE BOOL "Have some termlib" FORCE)
+ SET(BRLCAD_TERMLIB_BUILD "System" CACHE STRING "Disable libtermlib
build on WIN32." FORCE)
+ SET(HAVE_TERMLIB 0 CACHE BOOL "Have some termlib" FORCE)
ENDIF(NOT WIN32)
MARK_AS_ADVANCED(HAVE_TERMLIB)
IF(HAVE_TERMLIB)
THIRD_PARTY(termlib libtermlib)
- IF(BRLCAD_BUILD_LOCAL_TERMLIB)
+ IF(BRLCAD_TERMLIB_BUILD)
SET(HAVE_TERMCAP_H 1 CACHE BOOL "src/other termlib is on" FORCE)
- ENDIF(BRLCAD_BUILD_LOCAL_TERMLIB)
+ ENDIF(BRLCAD_TERMLIB_BUILD)
ELSE(HAVE_TERMLIB)
DISTCHECK_IGNORE_ITEM(libtermlib)
ENDIF(HAVE_TERMLIB)
@@ -325,6 +324,7 @@
ELSE(BRLCAD_ITCL_BUILD)
SET(ITCL_VERSION "${ITCL_PACKAGE_VERSION}" CACHE STRING "ITCL_VERSION"
FORCE)
find_library(ITCL_LIBRARY itcl)
+ SET(ITCL_LIBRARY ${ITCL_LIBRARY} CACHE STRING "ITCL_LIBRARY" FORCE)
get_filename_component(ITCL_BIN_PREFIX ${ITCL_LIBRARY} PATH)
MARK_AS_ADVANCED(ITCL_LIBRARY)
ENDIF(BRLCAD_ITCL_BUILD)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
uberSVN's rich system and user administration capabilities and model
configuration take the hassle out of deploying and managing Subversion and
the tools developers use with it. Learn more about uberSVN and get a free
download at: http://p.sf.net/sfu/wandisco-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
