[Cmake-commits] CMake branch, next, updated. v2.8.8-3257-g7a9dfe9
Rolf Eike Beer
eike at sf-mail.de
Tue Jun 19 15:06:39 EDT 2012
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 7a9dfe9644dfd4a75efe41e0dcb73d26cc11d27a (commit)
via e93ac6fbfe95cdbea25cbe75b6a0c7a3c89d0b8d (commit)
from 693055255a63f1cc4cd2ffec7b8daf8e2aadd151 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7a9dfe9644dfd4a75efe41e0dcb73d26cc11d27a
commit 7a9dfe9644dfd4a75efe41e0dcb73d26cc11d27a
Merge: 6930552 e93ac6f
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Jun 19 15:06:36 2012 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 19 15:06:36 2012 -0400
Merge topic 'no-explicit-usr-search' into next
e93ac6f do not explicitely specify /usr and /usr/local as search paths
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e93ac6fbfe95cdbea25cbe75b6a0c7a3c89d0b8d
commit e93ac6fbfe95cdbea25cbe75b6a0c7a3c89d0b8d
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Mar 26 17:21:15 2012 +0200
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Tue Jun 19 21:06:27 2012 +0200
do not explicitely specify /usr and /usr/local as search paths
If not explicitely excluded these paths are searched automatically anyway.
diff --git a/Modules/FindFLTK.cmake b/Modules/FindFLTK.cmake
index bb18a2e..5473301 100644
--- a/Modules/FindFLTK.cmake
+++ b/Modules/FindFLTK.cmake
@@ -105,8 +105,6 @@ IF(NOT FLTK_DIR)
# Look in standard UNIX install locations.
/usr/local/lib/fltk
/usr/lib/fltk
- /usr/local/include
- /usr/include
/usr/local/fltk
/usr/X11R6/include
diff --git a/Modules/FindFLTK2.cmake b/Modules/FindFLTK2.cmake
index 436e280..b475a64 100644
--- a/Modules/FindFLTK2.cmake
+++ b/Modules/FindFLTK2.cmake
@@ -85,8 +85,6 @@ IF(NOT FLTK2_DIR)
# Look in standard UNIX install locations.
/usr/local/lib/fltk2
/usr/lib/fltk2
- /usr/local/include
- /usr/include
/usr/local/fltk2
/usr/X11R6/include
@@ -193,8 +191,6 @@ IF(FLTK2_DIR)
ENDIF(FLTK2_FLUID_EXECUTABLE)
SET(FLTK2_INCLUDE_SEARCH_PATH ${FLTK2_INCLUDE_SEARCH_PATH}
- /usr/local/include
- /usr/include
/usr/local/fltk2
/usr/X11R6/include
)
@@ -202,8 +198,6 @@ IF(FLTK2_DIR)
FIND_PATH(FLTK2_INCLUDE_DIR fltk/run.h ${FLTK2_INCLUDE_SEARCH_PATH})
SET(FLTK2_LIBRARY_SEARCH_PATH ${FLTK2_LIBRARY_SEARCH_PATH}
- /usr/lib
- /usr/local/lib
/usr/local/fltk2/lib
/usr/X11R6/lib
${FLTK2_INCLUDE_DIR}/lib
diff --git a/Modules/FindLua50.cmake b/Modules/FindLua50.cmake
index ee8b84e..9a5cc17 100644
--- a/Modules/FindLua50.cmake
+++ b/Modules/FindLua50.cmake
@@ -31,8 +31,6 @@ FIND_PATH(LUA_INCLUDE_DIR lua.h
PATHS
~/Library/Frameworks
/Library/Frameworks
- /usr/local
- /usr
/sw # Fink
/opt/local # DarwinPorts
/opt/csw # Blastwave
@@ -47,8 +45,6 @@ FIND_LIBRARY(LUA_LIBRARY_lua
PATHS
~/Library/Frameworks
/Library/Frameworks
- /usr/local
- /usr
/sw
/opt/local
/opt/csw
@@ -67,8 +63,6 @@ ELSE(${LUA_LIBRARY_lua} MATCHES "framework")
$ENV{LUA_DIR}
PATH_SUFFIXES lib64 lib
PATHS
- /usr/local
- /usr
/sw
/opt/local
/opt/csw
diff --git a/Modules/FindLua51.cmake b/Modules/FindLua51.cmake
index b67dd4c..e111d36 100644
--- a/Modules/FindLua51.cmake
+++ b/Modules/FindLua51.cmake
@@ -32,8 +32,6 @@ FIND_PATH(LUA_INCLUDE_DIR lua.h
PATHS
~/Library/Frameworks
/Library/Frameworks
- /usr/local
- /usr
/sw # Fink
/opt/local # DarwinPorts
/opt/csw # Blastwave
@@ -48,8 +46,6 @@ FIND_LIBRARY(LUA_LIBRARY
PATHS
~/Library/Frameworks
/Library/Frameworks
- /usr/local
- /usr
/sw
/opt/local
/opt/csw
diff --git a/Modules/FindOpenAL.cmake b/Modules/FindOpenAL.cmake
index bcba6e2..cb3ce48 100644
--- a/Modules/FindOpenAL.cmake
+++ b/Modules/FindOpenAL.cmake
@@ -68,8 +68,6 @@ FIND_PATH(OPENAL_INCLUDE_DIR al.h
PATHS
~/Library/Frameworks
/Library/Frameworks
- /usr/local
- /usr
/sw # Fink
/opt/local # DarwinPorts
/opt/csw # Blastwave
@@ -85,8 +83,6 @@ FIND_LIBRARY(OPENAL_LIBRARY
PATHS
~/Library/Frameworks
/Library/Frameworks
- /usr/local
- /usr
/sw
/opt/local
/opt/csw
diff --git a/Modules/FindPhysFS.cmake b/Modules/FindPhysFS.cmake
index 80dfd51..2e3ac14 100644
--- a/Modules/FindPhysFS.cmake
+++ b/Modules/FindPhysFS.cmake
@@ -30,8 +30,6 @@ FIND_PATH(PHYSFS_INCLUDE_DIR physfs.h
PATHS
~/Library/Frameworks
/Library/Frameworks
- /usr/local
- /usr
/sw # Fink
/opt/local # DarwinPorts
/opt/csw # Blastwave
@@ -46,8 +44,6 @@ FIND_LIBRARY(PHYSFS_LIBRARY
PATHS
~/Library/Frameworks
/Library/Frameworks
- /usr/local
- /usr
/sw
/opt/local
/opt/csw
diff --git a/Modules/FindProducer.cmake b/Modules/FindProducer.cmake
index 39a9436..26c804a 100644
--- a/Modules/FindProducer.cmake
+++ b/Modules/FindProducer.cmake
@@ -51,8 +51,6 @@ FIND_PATH(PRODUCER_INCLUDE_DIR Producer/CameraGroup
PATHS
~/Library/Frameworks
/Library/Frameworks
- /usr/local/include
- /usr/include
/sw/include # Fink
/opt/local/include # DarwinPorts
/opt/csw/include # Blastwave
@@ -69,8 +67,6 @@ FIND_LIBRARY(PRODUCER_LIBRARY
$ENV{OSGDIR}
PATH_SUFFIXES lib64 lib
PATHS
- /usr/local
- /usr
/sw
/opt/local
/opt/csw
diff --git a/Modules/FindSDL_image.cmake b/Modules/FindSDL_image.cmake
index 9a130fa..f215bda 100644
--- a/Modules/FindSDL_image.cmake
+++ b/Modules/FindSDL_image.cmake
@@ -39,8 +39,6 @@ FIND_PATH(SDLIMAGE_INCLUDE_DIR SDL_image.h
/usr/local/include/SDL11 # FreeBSD ports
/usr/include/SDL12
/usr/include/SDL11
- /usr/local/include
- /usr/include
/sw/include/SDL # Fink
/sw/include
/opt/local/include/SDL # DarwinPorts
@@ -60,8 +58,6 @@ FIND_LIBRARY(SDLIMAGE_LIBRARY
PATHS
~/Library/Frameworks
/Library/Frameworks
- /usr/local
- /usr
/sw
/opt/local
/opt/csw
diff --git a/Modules/FindSDL_mixer.cmake b/Modules/FindSDL_mixer.cmake
index ce1ae9e..7cc1a6b 100644
--- a/Modules/FindSDL_mixer.cmake
+++ b/Modules/FindSDL_mixer.cmake
@@ -39,8 +39,6 @@ FIND_PATH(SDLMIXER_INCLUDE_DIR SDL_mixer.h
/usr/local/include/SDL11 # FreeBSD ports
/usr/include/SDL12
/usr/include/SDL11
- /usr/local/include
- /usr/include
/sw/include/SDL # Fink
/sw/include
/opt/local/include/SDL # DarwinPorts
@@ -60,8 +58,6 @@ FIND_LIBRARY(SDLMIXER_LIBRARY
PATHS
~/Library/Frameworks
/Library/Frameworks
- /usr/local
- /usr
/sw
/opt/local
/opt/csw
diff --git a/Modules/FindSDL_net.cmake b/Modules/FindSDL_net.cmake
index b5ada54..ca1de79 100644
--- a/Modules/FindSDL_net.cmake
+++ b/Modules/FindSDL_net.cmake
@@ -39,8 +39,6 @@ FIND_PATH(SDLNET_INCLUDE_DIR SDL_net.h
/usr/local/include/SDL11 # FreeBSD ports
/usr/include/SDL12
/usr/include/SDL11
- /usr/local/include
- /usr/include
/sw/include/SDL # Fink
/sw/include
/opt/local/include/SDL # DarwinPorts
@@ -59,8 +57,6 @@ FIND_LIBRARY(SDLNET_LIBRARY
PATHS
~/Library/Frameworks
/Library/Frameworks
- /usr/local
- /usr
/sw
/opt/local
/opt/csw
diff --git a/Modules/FindSDL_sound.cmake b/Modules/FindSDL_sound.cmake
index 8edf6ca..35294a5 100644
--- a/Modules/FindSDL_sound.cmake
+++ b/Modules/FindSDL_sound.cmake
@@ -86,8 +86,6 @@ FIND_PATH(SDL_SOUND_INCLUDE_DIR SDL_sound.h
/usr/local/include/SDL11 # FreeBSD ports
/usr/include/SDL12
/usr/include/SDL11
- /usr/local/include
- /usr/include
/sw/include/SDL # Fink
/sw/include
/opt/local/include/SDL # DarwinPorts
@@ -106,8 +104,6 @@ FIND_LIBRARY(SDL_SOUND_LIBRARY
$ENV{SDLDIR}/lib
$ENV{SDLDIR}
PATHS
- /usr/local/lib
- /usr/lib
/sw/lib
/opt/local/lib
/opt/csw/lib
@@ -222,8 +218,6 @@ IF(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
$ENV{SDLSOUNDDIR}
$ENV{SDLDIR}/lib
$ENV{SDLDIR}
- /usr/local/lib
- /usr/lib
/sw/lib
/opt/local/lib
/opt/csw/lib
@@ -245,8 +239,6 @@ IF(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
$ENV{SDLSOUNDDIR}
$ENV{SDLDIR}/lib
$ENV{SDLDIR}
- /usr/local/lib
- /usr/lib
/sw/lib
/opt/local/lib
/opt/csw/lib
@@ -271,8 +263,6 @@ IF(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
$ENV{SDLSOUNDDIR}
$ENV{SDLDIR}/lib
$ENV{SDLDIR}
- /usr/local/lib
- /usr/lib
/sw/lib
/opt/local/lib
/opt/csw/lib
@@ -293,8 +283,6 @@ IF(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
$ENV{SDLSOUNDDIR}
$ENV{SDLDIR}/lib
$ENV{SDLDIR}
- /usr/local/lib
- /usr/lib
/sw/lib
/opt/local/lib
/opt/csw/lib
@@ -317,8 +305,6 @@ IF(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
$ENV{SDLSOUNDDIR}
$ENV{SDLDIR}/lib
$ENV{SDLDIR}
- /usr/local/lib
- /usr/lib
/sw/lib
/opt/local/lib
/opt/csw/lib
@@ -341,8 +327,6 @@ IF(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
$ENV{SDLSOUNDDIR}
$ENV{SDLDIR}/lib
$ENV{SDLDIR}
- /usr/local/lib
- /usr/lib
/sw/lib
/opt/local/lib
/opt/csw/lib
@@ -368,8 +352,6 @@ IF(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
$ENV{SDLSOUNDDIR}
$ENV{SDLDIR}/lib
$ENV{SDLDIR}
- /usr/local/lib
- /usr/lib
/sw/lib
/opt/local/lib
/opt/csw/lib
@@ -395,8 +377,6 @@ IF(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
$ENV{SDLSOUNDDIR}
$ENV{SDLDIR}/lib
$ENV{SDLDIR}
- /usr/local/lib
- /usr/lib
/sw/lib
/opt/local/lib
/opt/csw/lib
diff --git a/Modules/FindSDL_ttf.cmake b/Modules/FindSDL_ttf.cmake
index 3d07ab7..184b6c3 100644
--- a/Modules/FindSDL_ttf.cmake
+++ b/Modules/FindSDL_ttf.cmake
@@ -39,8 +39,6 @@ FIND_PATH(SDLTTF_INCLUDE_DIR SDL_ttf.h
/usr/local/include/SDL11 # FreeBSD ports
/usr/include/SDL12
/usr/include/SDL11
- /usr/local/include
- /usr/include
/sw/include/SDL # Fink
/sw/include
/opt/local/include/SDL # DarwinPorts
@@ -59,8 +57,6 @@ FIND_LIBRARY(SDLTTF_LIBRARY
PATHS
~/Library/Frameworks
/Library/Frameworks
- /usr/local
- /usr
/sw
/opt/local
/opt/csw
diff --git a/Modules/FindTCL.cmake b/Modules/FindTCL.cmake
index f2c776f..7f6d3a7 100644
--- a/Modules/FindTCL.cmake
+++ b/Modules/FindTCL.cmake
@@ -82,8 +82,6 @@ SET(TCLTK_POSSIBLE_LIB_PATHS
"${TK_LIBRARY_PATH}"
"${TCL_TCLSH_PATH_PARENT}/lib"
"${TK_WISH_PATH_PARENT}/lib"
- /usr/lib
- /usr/local/lib
)
IF(WIN32)
@@ -162,8 +160,6 @@ SET(TCLTK_POSSIBLE_INCLUDE_PATHS
${TK_FRAMEWORK_INCLUDES}
"${TCL_TCLSH_PATH_PARENT}/include"
"${TK_WISH_PATH_PARENT}/include"
- /usr/include
- /usr/local/include
/usr/include/tcl${TK_LIBRARY_VERSION}
/usr/include/tcl${TCL_LIBRARY_VERSION}
/usr/include/tcl8.6
diff --git a/Modules/FindTclStub.cmake b/Modules/FindTclStub.cmake
index 4db2716..79d14ae 100644
--- a/Modules/FindTclStub.cmake
+++ b/Modules/FindTclStub.cmake
@@ -66,8 +66,6 @@ SET(TCLTK_POSSIBLE_LIB_PATHS
"${TK_LIBRARY_PATH}"
"${TCL_TCLSH_PATH_PARENT}/lib"
"${TK_WISH_PATH_PARENT}/lib"
- /usr/lib
- /usr/local/lib
)
IF(WIN32)
-----------------------------------------------------------------------
Summary of changes:
Modules/FindFLTK.cmake | 2 --
Modules/FindFLTK2.cmake | 6 ------
Modules/FindLua50.cmake | 6 ------
Modules/FindLua51.cmake | 4 ----
Modules/FindOpenAL.cmake | 4 ----
Modules/FindPhysFS.cmake | 4 ----
Modules/FindProducer.cmake | 4 ----
Modules/FindSDL_image.cmake | 4 ----
Modules/FindSDL_mixer.cmake | 4 ----
Modules/FindSDL_net.cmake | 4 ----
Modules/FindSDL_sound.cmake | 20 --------------------
Modules/FindSDL_ttf.cmake | 4 ----
Modules/FindTCL.cmake | 4 ----
Modules/FindTclStub.cmake | 2 --
14 files changed, 0 insertions(+), 72 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list