Changeset 2696

Timestamp:

Feb 23, 2009, 10:35:53 PM (16 years ago)

Author:

rgrieder

Message:

Bugfix: Accidentally removed /usr from the CMAKE_PREFIX_PATH.

File:

• code/branches/buildsystem3/cmake/LibraryConfig.cmake (modified) (1 diff)

code/branches/buildsystem3/cmake/LibraryConfig.cmake

@@ -29 +29 @@
 INCLUDE(FindPackageHandleStandardArgs)
 
-# Prevent CMake from finding libraries in the installation folder on windows
+# Prevent CMake from finding libraries in the installation folder on Windows.
 # There might already be an installation from another compiler
-LIST(REMOVE_ITEM CMAKE_SYSTEM_PREFIX_PATH "${CMAKE_INSTALL_PREFIX}")
-LIST(REMOVE_ITEM CMAKE_SYSTEM_LIBRARY_PATH "${CMAKE_INSTALL_PREFIX}/bin")
+IF(DEPENDENCY_PACKAGE_ENABLE)
+  LIST(REMOVE_ITEM CMAKE_SYSTEM_PREFIX_PATH  "${CMAKE_INSTALL_PREFIX}")
+  LIST(REMOVE_ITEM CMAKE_SYSTEM_LIBRARY_PATH "${CMAKE_INSTALL_PREFIX}/bin")
+ENDIF()
 
 ############## Platform Scripts #################