Revision: 40555
http://brlcad.svn.sourceforge.net/brlcad/?rev=40555&view=rev
Author: starseeker
Date: 2010-09-13 21:14:40 +0000 (Mon, 13 Sep 2010)
Log Message:
-----------
Whoops - if we have a package version, turn OFF the local build, and vice versa.
Modified Paths:
--------------
brlcad/branches/cmake/misc/CMake/FindTclPackage.cmake
Modified: brlcad/branches/cmake/misc/CMake/FindTclPackage.cmake
===================================================================
--- brlcad/branches/cmake/misc/CMake/FindTclPackage.cmake 2010-09-13
20:34:17 UTC (rev 40554)
+++ brlcad/branches/cmake/misc/CMake/FindTclPackage.cmake 2010-09-13
21:14:40 UTC (rev 40555)
@@ -18,11 +18,11 @@
#STRING(REGEX REPLACE "([0-9]+\.?[0-9]*)" "\\1" ${pkgversion} ${pkgversion})
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" OFF)
+ SET(${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${PKGNAME_UPPER} OFF
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" 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)
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
