Revision: 40585
http://brlcad.svn.sourceforge.net/brlcad/?rev=40585&view=rev
Author: starseeker
Date: 2010-09-16 01:48:57 +0000 (Thu, 16 Sep 2010)
Log Message:
-----------
Make sure CMAKE_INSTALL_PREFIX just doesn't end up in the cache - it seems to
work fine ifwe set it in the CMakeLists.txt file, and its being in the Cache at
all appears to be a potential problem for Find routines.
Modified Paths:
--------------
brlcad/branches/cmake/CMakeLists.txt
Modified: brlcad/branches/cmake/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/CMakeLists.txt 2010-09-16 00:52:41 UTC (rev
40584)
+++ brlcad/branches/cmake/CMakeLists.txt 2010-09-16 01:48:57 UTC (rev
40585)
@@ -85,10 +85,12 @@
# Repeated runs of cmake wil result in this variable being set during
# the Find* routines, which will return libraries from previous
-# installs. Re-set this at the beginning of the file - this ensures
-# that Find* results are consistent between the first run and
-# previous runs
-SET(CMAKE_INSTALL_PREFIX "")
+# installs. Even if never set using CACHE by the CMakeLists.txt file,
+# /usr/local gets written to the CACHE file. If BRL-CAD happened to
+# be installed there, this would very probably cause the same trouble
+# being seen with detected CMAKE_INSTALL_PREFIX libs in other directories.
+# Hard erase this variable's setting in the cache.
+SET(CMAKE_INSTALL_PREFIX "" CACHE INTERNAL "Keep CMAKE_INSTALL_PREFIX unset in
CACHE so repeated Find* operations return consistent results")
#---------------------------------------------------------------------
# By default (as of version 2.8.2) CMake does not provide access to
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
