Revision: 44608
http://brlcad.svn.sourceforge.net/brlcad/?rev=44608&view=rev
Author: starseeker
Date: 2011-05-10 20:54:27 +0000 (Tue, 10 May 2011)
Log Message:
-----------
Go for the SYSTEM paths - they aren't intended to be modified by the project
according to CMake, but until we find another way to avoid searching
CMAKE_INSTALL_PREFIX we seem to have little choice. Need to test this on
Windows to see if it helps there.
Modified Paths:
--------------
brlcad/trunk/CMakeLists.txt
Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt 2011-05-10 20:35:55 UTC (rev 44607)
+++ brlcad/trunk/CMakeLists.txt 2011-05-10 20:54:27 UTC (rev 44608)
@@ -145,18 +145,16 @@
IF(CMAKE_INSTALL_PREFIX)
- PATH_REMOVE(CMAKE_PREFIX_PATH CMAKE_INSTALL_PREFIX)
PATH_REMOVE(CMAKE_SYSTEM_PREFIX_PATH CMAKE_INSTALL_PREFIX)
- PATH_REMOVE(CMAKE_INCLUDE_PATH CMAKE_INSTALL_PREFIX)
- PATH_REMOVE(CMAKE_LIBRARY_PATH CMAKE_INSTALL_PREFIX)
- PATH_REMOVE(CMAKE_PROGRAM_PATH CMAKE_INSTALL_PREFIX)
+ PATH_REMOVE(CMAKE_SYSTEM_INCLUDE_PATH CMAKE_INSTALL_PREFIX)
+ PATH_REMOVE(CMAKE_SYSTEM_LIBRARY_PATH CMAKE_INSTALL_PREFIX)
+ PATH_REMOVE(CMAKE_SYSTEM_PROGRAM_PATH CMAKE_INSTALL_PREFIX)
ENDIF(CMAKE_INSTALL_PREFIX)
IF(BRLCAD_PREFIX)
- PATH_REMOVE(CMAKE_PREFIX_PATH BRLCAD_PREFIX)
PATH_REMOVE(CMAKE_SYSTEM_PREFIX_PATH BRLCAD_PREFIX)
- PATH_REMOVE(CMAKE_INCLUDE_PATH BRLCAD_PREFIX)
- PATH_REMOVE(CMAKE_LIBRARY_PATH BRLCAD_PREFIX)
- PATH_REMOVE(CMAKE_PROGRAM_PATH BRLCAD_PREFIX)
+ PATH_REMOVE(CMAKE_SYSTEM_INCLUDE_PATH BRLCAD_PREFIX)
+ PATH_REMOVE(CMAKE_SYSTEM_LIBRARY_PATH BRLCAD_PREFIX)
+ PATH_REMOVE(CMAKE_SYSTEM_PROGRAM_PATH BRLCAD_PREFIX)
ENDIF(BRLCAD_PREFIX)
#---------------------------------------------------------------------
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Achieve unprecedented app performance and reliability
What every C/C++ and Fortran developer should know.
Learn how Intel has extended the reach of its next-generation tools
to help boost performance applications - inlcuding clusters.
http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
