echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Modules: Remove paths set as global Unix prefixes

Browse Source 
This commit removes hardcoded paths that are already given in the
platform files or in `UnixPath` on a global level.
This commit is contained in:
Christian Pfeiffer 2017-11-20 16:21:49 +01:00
parent 85ae0ba796
commit f88ef9a9b8
13 changed files with 8 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/FindFreetype.cmake
View File

@ -63,10 +63,6 @@ set(FREETYPE_FIND_ARGS
HINTS HINTS
ENV FREETYPE_DIR ENV FREETYPE_DIR
PATHS PATHS
/usr/X11R6
/usr/local/X11R6
/usr/local/X11
/usr/freeware
ENV GTKMM_BASEPATH ENV GTKMM_BASEPATH
[HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path] [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
[HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path] [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]

21
Modules/FindGDAL.cmake
View File

@ -49,14 +49,6 @@ find_path(GDAL_INCLUDE_DIR gdal.h
PATH_SUFFIXES PATH_SUFFIXES
include/gdal include/gdal
include/GDAL include/GDAL
include
PATHS
~/Library/Frameworks/gdal.framework/Headers
/Library/Frameworks/gdal.framework/Headers
/sw # Fink
/opt/local # DarwinPorts
/opt/csw # Blastwave
/opt
) )
if(UNIX) if(UNIX)
@ -68,12 +60,6 @@ if(UNIX)
HINTS HINTS
ENV GDAL_DIR ENV GDAL_DIR
ENV GDAL_ROOT ENV GDAL_ROOT
PATH_SUFFIXES bin
PATHS
/sw # Fink
/opt/local # DarwinPorts
/opt/csw # Blastwave
/opt
) )
if(GDAL_CONFIG) if(GDAL_CONFIG)
@ -93,13 +79,6 @@ find_library(GDAL_LIBRARY
ENV GDAL_DIR ENV GDAL_DIR
ENV GDAL_ROOT ENV GDAL_ROOT
${_gdal_libpath} ${_gdal_libpath}
PATH_SUFFIXES lib
PATHS
/sw
/opt/local
/opt/csw
/opt
/usr/freeware
) )
include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)

8
Modules/FindGIF.cmake
View File

@ -30,10 +30,6 @@
find_path(GIF_INCLUDE_DIR gif_lib.h find_path(GIF_INCLUDE_DIR gif_lib.h
HINTS HINTS
ENV GIF_DIR ENV GIF_DIR
PATH_SUFFIXES include
PATHS
~/Library/Frameworks
/usr/freeware
) )
# the gif library can have many names :-/ # the gif library can have many names :-/
@ -43,10 +39,6 @@ find_library(GIF_LIBRARY
NAMES ${POTENTIAL_GIF_LIBS} NAMES ${POTENTIAL_GIF_LIBS}
HINTS HINTS
ENV GIF_DIR ENV GIF_DIR
PATH_SUFFIXES lib
PATHS
~/Library/Frameworks
/usr/freeware
) )
# see readme.txt # see readme.txt

2
Modules/FindGTK2.cmake
View File

@ -298,8 +298,6 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hdr)
/usr/libx32 /usr/libx32
/usr/lib64 /usr/lib64
/usr/lib /usr/lib
/usr/X11R6/include
/usr/X11R6/lib
/opt/gnome/include /opt/gnome/include
/opt/gnome/lib /opt/gnome/lib
/opt/openwin/include /opt/openwin/include

4
Modules/FindJNI.cmake
View File

@ -126,8 +126,6 @@ list(APPEND JAVA_AWT_LIBRARY_DIRECTORIES
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/lib" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/lib"
) )
JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
/usr/lib
/usr/local/lib
/usr/lib/jvm/java/lib /usr/lib/jvm/java/lib
/usr/lib/java/jre/lib/{libarch} /usr/lib/java/jre/lib/{libarch}
/usr/lib/jvm/jre/lib/{libarch} /usr/lib/jvm/jre/lib/{libarch}
@ -185,8 +183,6 @@ list(APPEND JAVA_AWT_INCLUDE_DIRECTORIES
) )
JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_INCLUDE_DIRECTORIES JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_INCLUDE_DIRECTORIES
/usr/include
/usr/local/include
/usr/lib/java/include /usr/lib/java/include
/usr/local/lib/java/include /usr/local/lib/java/include
/usr/lib/jvm/java/include /usr/lib/jvm/java/include

16
Modules/FindOpenGL.cmake
View File

@ -182,7 +182,7 @@ else()
find_path(OPENGL_INCLUDE_DIR GL/gl.h find_path(OPENGL_INCLUDE_DIR GL/gl.h
/usr/share/doc/NVIDIA_GLX-1.0/include /usr/share/doc/NVIDIA_GLX-1.0/include
/usr/openwin/share/include /usr/openwin/share/include
/opt/graphics/OpenGL/include /usr/X11R6/include /opt/graphics/OpenGL/include
${_OPENGL_INCLUDE_PATH} ${_OPENGL_INCLUDE_PATH}
) )
find_path(OPENGL_GLX_INCLUDE_DIR GL/glx.h ${_OPENGL_INCLUDE_PATH}) find_path(OPENGL_GLX_INCLUDE_DIR GL/glx.h ${_OPENGL_INCLUDE_PATH})
@ -190,21 +190,19 @@ else()
find_path(OPENGL_xmesa_INCLUDE_DIR GL/xmesa.h find_path(OPENGL_xmesa_INCLUDE_DIR GL/xmesa.h
/usr/share/doc/NVIDIA_GLX-1.0/include /usr/share/doc/NVIDIA_GLX-1.0/include
/usr/openwin/share/include /usr/openwin/share/include
/opt/graphics/OpenGL/include /usr/X11R6/include /opt/graphics/OpenGL/include
) )
# Search for the GLVND libraries. We do this regardless of COMPONENTS; we'll # Search for the GLVND libraries. We do this regardless of COMPONENTS; we'll
# take into account the COMPONENTS logic later. # take into account the COMPONENTS logic later.
find_library(OPENGL_opengl_LIBRARY find_library(OPENGL_opengl_LIBRARY
NAMES OpenGL NAMES OpenGL
PATHS /usr/X11R6/lib PATHS ${_OPENGL_LIB_PATH}
${_OPENGL_LIB_PATH}
) )
find_library(OPENGL_glx_LIBRARY find_library(OPENGL_glx_LIBRARY
NAMES GLX NAMES GLX
PATHS /usr/X11R6/lib PATHS ${_OPENGL_LIB_PATH}
${_OPENGL_LIB_PATH}
) )
find_library(OPENGL_egl_LIBRARY find_library(OPENGL_egl_LIBRARY
@ -217,7 +215,7 @@ else()
PATHS ${OPENGL_gl_LIBRARY} PATHS ${OPENGL_gl_LIBRARY}
/opt/graphics/OpenGL/lib /opt/graphics/OpenGL/lib
/usr/openwin/lib /usr/openwin/lib
/usr/shlib /usr/X11R6/lib /usr/shlib
) )
if(NOT DEFINED OpenGL_GL_PREFERENCE) if(NOT DEFINED OpenGL_GL_PREFERENCE)
@ -252,7 +250,7 @@ else()
NAMES GL MesaGL NAMES GL MesaGL
PATHS /opt/graphics/OpenGL/lib PATHS /opt/graphics/OpenGL/lib
/usr/openwin/lib /usr/openwin/lib
/usr/shlib /usr/X11R6/lib /usr/shlib
${_OPENGL_LIB_PATH} ${_OPENGL_LIB_PATH}
) )
endif() endif()
@ -323,7 +321,7 @@ else()
PATHS ${OPENGL_gl_LIBRARY} PATHS ${OPENGL_gl_LIBRARY}
/opt/graphics/OpenGL/lib /opt/graphics/OpenGL/lib
/usr/openwin/lib /usr/openwin/lib
/usr/shlib /usr/X11R6/lib /usr/shlib
) )
endif () endif ()

21
Modules/FindOpenThreads.cmake
View File

@ -58,13 +58,6 @@ find_path(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
ENV OSG_ROOT ENV OSG_ROOT
${OPENTHREADS_DIR} ${OPENTHREADS_DIR}
${OSG_DIR} ${OSG_DIR}
PATHS
/sw # Fink
/opt/local # DarwinPorts
/opt/csw # Blastwave
/opt
/usr/freeware
PATH_SUFFIXES include
) )
@ -80,13 +73,6 @@ find_library(OPENTHREADS_LIBRARY
ENV OSG_ROOT ENV OSG_ROOT
${OPENTHREADS_DIR} ${OPENTHREADS_DIR}
${OSG_DIR} ${OSG_DIR}
PATHS
/sw
/opt/local
/opt/csw
/opt
/usr/freeware
PATH_SUFFIXES lib
) )
find_library(OPENTHREADS_LIBRARY_DEBUG find_library(OPENTHREADS_LIBRARY_DEBUG
@ -102,13 +88,6 @@ find_library(OPENTHREADS_LIBRARY_DEBUG
ENV OSG_ROOT ENV OSG_ROOT
${OPENTHREADS_DIR} ${OPENTHREADS_DIR}
${OSG_DIR} ${OSG_DIR}
PATHS
/sw
/opt/local
/opt/csw
/opt
/usr/freeware
PATH_SUFFIXES lib
) )
if(OPENTHREADS_LIBRARY_DEBUG) if(OPENTHREADS_LIBRARY_DEBUG)

8
Modules/FindSelfPackers.cmake
View File

@ -20,19 +20,11 @@ include(${CMAKE_CURRENT_LIST_DIR}/FindCygwin.cmake)
find_program(SELF_PACKER_FOR_EXECUTABLE find_program(SELF_PACKER_FOR_EXECUTABLE
upx upx
${CYGWIN_INSTALL_PATH}/bin ${CYGWIN_INSTALL_PATH}/bin
/bin
/usr/bin
/usr/local/bin
/sbin
) )
find_program(SELF_PACKER_FOR_SHARED_LIB find_program(SELF_PACKER_FOR_SHARED_LIB
upx upx
${CYGWIN_INSTALL_PATH}/bin ${CYGWIN_INSTALL_PATH}/bin
/bin
/usr/bin
/usr/local/bin
/sbin
) )
mark_as_advanced( mark_as_advanced(

3
Modules/FindSquish.cmake
View File

@ -144,9 +144,6 @@ if(NOT SQUISH_INSTALL_DIR)
# Look in places relative to the system executable search path. # Look in places relative to the system executable search path.
${SQUISH_INSTALL_DIR_SEARCH} ${SQUISH_INSTALL_DIR_SEARCH}
# Look in standard UNIX install locations.
#/usr/local/squish
DOC "The ${SQUISH_INSTALL_DIR_STRING}" DOC "The ${SQUISH_INSTALL_DIR_STRING}"
) )
endif() endif()

24
Modules/FindUnixCommands.cmake
View File

@ -15,10 +15,6 @@ include(${CMAKE_CURRENT_LIST_DIR}/FindCygwin.cmake)
find_program(BASH find_program(BASH
bash bash
${CYGWIN_INSTALL_PATH}/bin ${CYGWIN_INSTALL_PATH}/bin
/bin
/usr/bin
/usr/local/bin
/sbin
) )
mark_as_advanced( mark_as_advanced(
BASH BASH
@ -27,10 +23,6 @@ mark_as_advanced(
find_program(CP find_program(CP
cp cp
${CYGWIN_INSTALL_PATH}/bin ${CYGWIN_INSTALL_PATH}/bin
/bin
/usr/bin
/usr/local/bin
/sbin
) )
mark_as_advanced( mark_as_advanced(
CP CP
@ -39,10 +31,6 @@ mark_as_advanced(
find_program(GZIP find_program(GZIP
gzip gzip
${CYGWIN_INSTALL_PATH}/bin ${CYGWIN_INSTALL_PATH}/bin
/bin
/usr/bin
/usr/local/bin
/sbin
) )
mark_as_advanced( mark_as_advanced(
GZIP GZIP
@ -51,10 +39,6 @@ mark_as_advanced(
find_program(MV find_program(MV
mv mv
${CYGWIN_INSTALL_PATH}/bin ${CYGWIN_INSTALL_PATH}/bin
/bin
/usr/bin
/usr/local/bin
/sbin
) )
mark_as_advanced( mark_as_advanced(
MV MV
@ -63,10 +47,6 @@ mark_as_advanced(
find_program(RM find_program(RM
rm rm
${CYGWIN_INSTALL_PATH}/bin ${CYGWIN_INSTALL_PATH}/bin
/bin
/usr/bin
/usr/local/bin
/sbin
) )
mark_as_advanced( mark_as_advanced(
RM RM
@ -78,10 +58,6 @@ find_program(TAR
gtar gtar
PATH PATH
${CYGWIN_INSTALL_PATH}/bin ${CYGWIN_INSTALL_PATH}/bin
/bin
/usr/bin
/usr/local/bin
/sbin
) )
mark_as_advanced( mark_as_advanced(
TAR TAR

21
Modules/Findosg_functions.cmake
View File

@ -28,13 +28,6 @@ function(OSG_FIND_PATH module header)
ENV OSG_ROOT ENV OSG_ROOT
${${module_uc}_DIR} ${${module_uc}_DIR}
${OSG_DIR} ${OSG_DIR}
PATH_SUFFIXES include
PATHS
/sw # Fink
/opt/local # DarwinPorts
/opt/csw # Blastwave
/opt
/usr/freeware
) )
endfunction() endfunction()
@ -54,13 +47,6 @@ function(OSG_FIND_LIBRARY module library)
ENV OSG_ROOT ENV OSG_ROOT
${${module_uc}_DIR} ${${module_uc}_DIR}
${OSG_DIR} ${OSG_DIR}
PATH_SUFFIXES lib
PATHS
/sw # Fink
/opt/local # DarwinPorts
/opt/csw # Blastwave
/opt
/usr/freeware
) )
find_library(${module_uc}_LIBRARY_DEBUG find_library(${module_uc}_LIBRARY_DEBUG
@ -72,13 +58,6 @@ function(OSG_FIND_LIBRARY module library)
ENV OSG_ROOT ENV OSG_ROOT
${${module_uc}_DIR} ${${module_uc}_DIR}
${OSG_DIR} ${OSG_DIR}
PATH_SUFFIXES lib
PATHS
/sw # Fink
/opt/local # DarwinPorts
/opt/csw # Blastwave
/opt
/usr/freeware
) )
if(NOT ${module_uc}_LIBRARY_DEBUG) if(NOT ${module_uc}_LIBRARY_DEBUG)

2
Modules/GetPrerequisites.cmake
View File

@ -687,8 +687,6 @@ function(get_prerequisites target prerequisites_var exclude_system recurse exepa
"$ENV{VS71COMNTOOLS}/../../VC7/bin" "$ENV{VS71COMNTOOLS}/../../VC7/bin"
"C:/Program Files/Microsoft Visual Studio .NET 2003/VC7/BIN" "C:/Program Files/Microsoft Visual Studio .NET 2003/VC7/BIN"
"C:/Program Files (x86)/Microsoft Visual Studio .NET 2003/VC7/BIN" "C:/Program Files (x86)/Microsoft Visual Studio .NET 2003/VC7/BIN"
"/usr/local/bin"
"/usr/bin"
) )
# <setup-gp_tool-vars> # <setup-gp_tool-vars>

2
Source/CMakeLists.txt
View File

@ -918,7 +918,7 @@ if(UNIX)
# OpenBSD and also Linux and OSX. Look for the header and # OpenBSD and also Linux and OSX. Look for the header and
# the library; it's a warning on FreeBSD if they're not # the library; it's a warning on FreeBSD if they're not
# found, and informational on other platforms. # found, and informational on other platforms.
find_path(FREEBSD_PKG_INCLUDE_DIRS "pkg.h" PATHS /usr/local) find_path(FREEBSD_PKG_INCLUDE_DIRS "pkg.h")
if(FREEBSD_PKG_INCLUDE_DIRS) if(FREEBSD_PKG_INCLUDE_DIRS)
find_library(FREEBSD_PKG_LIBRARIES find_library(FREEBSD_PKG_LIBRARIES
pkg pkg