Revision: 40586
http://brlcad.svn.sourceforge.net/brlcad/?rev=40586&view=rev
Author: starseeker
Date: 2010-09-16 12:10:45 +0000 (Thu, 16 Sep 2010)
Log Message:
-----------
Still need ITCL_VERSION and ITK_VERSION defined in brlcad_config.h if found
externally - set accrodingly.
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-16 01:48:57 UTC
(rev 40585)
+++ brlcad/branches/cmake/src/other/CMakeLists.txt 2010-09-16 12:10:45 UTC
(rev 40586)
@@ -154,6 +154,8 @@
ENDIF(BRLCAD_BUILD_LOCAL_TCL)
IF(BRLCAD_BUILD_LOCAL_ITCL)
SET(ITCL_VERSION "3.4" CACHE STRING "ITCL_VERSION" FORCE)
+ELSE(BRLCAD_BUILD_LOCAL_ITCL)
+ SET(ITCL_VERSION "${ITCL_PACKAGE_VERSION}" CACHE STRING "ITCL_VERSION"
FORCE)
ENDIF(BRLCAD_BUILD_LOCAL_ITCL)
FILE(APPEND ${CONFIG_H_FILE} "#cmakedefine ITCL_VERSION
\"${ITCL_VERSION}\"\n")
@@ -161,6 +163,8 @@
IF(BRLCAD_BUILD_LOCAL_ITK)
ADD_DEPENDENCIES(itk itcl tcl tk)
SET(ITK_VERSION "3.3" CACHE STRING "ITK_VERSION" FORCE)
+ELSE(BRLCAD_BUILD_LOCAL_ITK)
+ SET(ITK_VERSION "${ITCL_PACKAGE_VERSION}" CACHE STRING "ITK_VERSION" FORCE)
ENDIF(BRLCAD_BUILD_LOCAL_ITK)
FILE(APPEND ${CONFIG_H_FILE} "#cmakedefine ITK_VERSION \"${ITK_VERSION}\"\n")
@@ -174,6 +178,8 @@
IF(BRLCAD_BUILD_LOCAL_IWIDGETS)
ADD_DEPENDENCIES(iwidgets tcl tk itcl itk)
SET(IWIDGETS_VERSION "4.0.1" CACHE STRING "IWIDGETS_VERSION" FORCE)
+ELSE(BRLCAD_BUILD_LOCAL_IWIDGETS)
+ SET(IWIDGETS_VERSION "${IWIDGETS_PACKAGE_VERSION" CACHE STRING
"IWIDGETS_VERSION" FORCE)
ENDIF(BRLCAD_BUILD_LOCAL_IWIDGETS)
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
