Revision: 40553
http://brlcad.svn.sourceforge.net/brlcad/?rev=40553&view=rev
Author: starseeker
Date: 2010-09-13 20:33:32 +0000 (Mon, 13 Sep 2010)
Log Message:
-----------
Few more fixes - these settings show up as undefined without the CACHE logic.
Modified Paths:
--------------
brlcad/branches/cmake/src/other/CMakeLists.txt
Modified: brlcad/branches/cmake/src/other/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/CMakeLists.txt 2010-09-13 20:04:42 UTC
(rev 40552)
+++ brlcad/branches/cmake/src/other/CMakeLists.txt 2010-09-13 20:33:32 UTC
(rev 40553)
@@ -115,8 +115,10 @@
# Now that Tcl/Tk is settled, define the HAVE_TK flag for the config.h file
IF(TK_LIBRARY)
- SET(HAVE_TK 1)
+ SET(HAVE_TK 1 CACHE STRING "C level Tk flag" FORCE)
FILE(APPEND ${CONFIG_H_FILE} "#cmakedefine HAVE_TK 1\n")
+ELSE(TK_LIBRARY)
+ SET(HAVE_TK 0 CACHE STRING "C level Tk flag" FORCE)
ENDIF(TK_LIBRARY)
# Depending on the Tcl/Tk results, look for packages required by BRL-CAD. If
@@ -160,7 +162,7 @@
ADD_DEPENDENCIES(itcl tcl)
ENDIF(BRLCAD_BUILD_LOCAL_TCL)
IF(BRLCAD_BUILD_LOCAL_ITCL)
- SET(ITCL_VERSION "3.4")
+ SET(ITCL_VERSION "3.4" CACHE STRING "ITCL_VERSION" FORCE)
ENDIF(BRLCAD_BUILD_LOCAL_ITCL)
FILE(APPEND ${CONFIG_H_FILE} "#cmakedefine ITCL_VERSION
\"${ITCL_VERSION}\"\n")
@@ -169,7 +171,7 @@
ADD_DEPENDENCIES(itk itcl tcl tk)
ENDIF(BRLCAD_BUILD_LOCAL_TK)
IF(BRLCAD_BUILD_LOCAL_ITK)
- SET(ITK_VERSION "3.3")
+ SET(ITK_VERSION "3.3" CACHE STRING "ITCL_VERSION" FORCE)
ENDIF(BRLCAD_BUILD_LOCAL_ITK)
FILE(APPEND ${CONFIG_H_FILE} "#cmakedefine ITK_VERSION \"${ITK_VERSION}\"\n")
@@ -182,7 +184,7 @@
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")
+ SET(IWIDGETS_VERSION "4.0.1" CACHE STRING "ITCL_VERSION" FORCE)
ENDIF(BRLCAD_BUILD_LOCAL_ITK)
FILE(APPEND ${CONFIG_H_FILE} "#define IWIDGETS_VERSION
\"${IWIDGETS_VERSION}\"\n")
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
