]> git.mxchange.org Git - flightgear.git/commitdiff
Remove some CMake search paths
authorJames Turner <zakalawe@mac.com>
Fri, 14 Feb 2014 20:45:03 +0000 (20:45 +0000)
committerJames Turner <zakalawe@mac.com>
Fri, 14 Feb 2014 20:45:19 +0000 (20:45 +0000)
As the comments says, none of these should be needed, or
they are added by CMake automatically.

CMakeLists.txt

index 6b67ac48e257c13049bc54c8903873d9516c6cdc..87117540048b0c6066779b727e97b2d621f3f0f3 100644 (file)
@@ -73,12 +73,6 @@ endif()
 # Configure library search paths
 #####################################################################################
 
-if(APPLE)
-    # Custom library directories for Mac, which should have precedence over any other
-    list(APPEND ADDITIONAL_LIBRARY_PATHS
-         ~/Library/Frameworks
-         /Library/Frameworks)
-endif(APPLE)
 
 if(NOT "${CMAKE_LIBRARY_ARCHITECTURE}" STREQUAL "")
     # Workaround for Ubuntu/Debian which introduced the "multiarch" library
@@ -93,13 +87,6 @@ if(NOT "${CMAKE_LIBRARY_ARCHITECTURE}" STREQUAL "")
     message(STATUS "additional library directories: ${ADDITIONAL_LIBRARY_PATHS}")
 endif()
 
-if(NOT MSVC)
-    # TBD: are these really necessary? Aren't they considered by cmake automatically?
-    list(APPEND ADDITIONAL_LIBRARY_PATHS
-         /opt/local
-         /usr/local
-         /usr)
-endif()
 #####################################################################################
 
 IF(APPLE)