From 80fa5d597783793afab25d55757254dcf9172716 Mon Sep 17 00:00:00 2001 From: Tomáš Chvátal Date: Sun, 16 Aug 2009 15:25:03 +0200 Subject: Move the bundled lib location as last hook. --- cmake/FindGettext.cmake | 4 ++-- cmake/FindSDL.cmake | 4 ++-- cmake/FindSDL_image.cmake | 4 ++-- cmake/FindSDL_mixer.cmake | 4 ++-- cmake/FindSDL_ttf.cmake | 4 ++-- cmake/FindZIP.cmake | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cmake/FindGettext.cmake b/cmake/FindGettext.cmake index f14922e..494d8b0 100644 --- a/cmake/FindGettext.cmake +++ b/cmake/FindGettext.cmake @@ -24,17 +24,17 @@ FIND_PATH(GETTEXT_INCLUDE_DIR libintl.h FIND_PROGRAM(GETTEXT_MSGMERGE_EXECUTABLE msgmerge PATHS - ${CMAKE_SOURCE_DIR}/packaging/windows/Gettext/exe/ /usr/local/bin /usr/bin + ${CMAKE_SOURCE_DIR}/packaging/windows/Gettext/exe/ NO_DEFAULT_PATH ) FIND_PROGRAM(GETTEXT_MSGFMT_EXECUTABLE msgfmt PATHS - ${CMAKE_SOURCE_DIR}/packaging/windows/Gettext/exe/ /usr/local/bin /usr/bin + ${CMAKE_SOURCE_DIR}/packaging/windows/Gettext/exe/ NO_DEFAULT_PATH ) diff --git a/cmake/FindSDL.cmake b/cmake/FindSDL.cmake index 3c22b3b..5240357 100644 --- a/cmake/FindSDL.cmake +++ b/cmake/FindSDL.cmake @@ -67,7 +67,6 @@ FIND_PATH(SDL_INCLUDE_DIR SDL.h /usr/include/SDL11 /usr/local/include /usr/include - ${CMAKE_SOURCE_DIR}/packaging/windows/SDL/include #tuxanci /sw/include/SDL # Fink /sw/include /opt/local/include/SDL # DarwinPorts @@ -76,6 +75,7 @@ FIND_PATH(SDL_INCLUDE_DIR SDL.h /opt/csw/include /opt/include/SDL /opt/include + ${CMAKE_SOURCE_DIR}/packaging/windows/SDL/include #tuxanci ) #MESSAGE("SDL_INCLUDE_DIR is ${SDL_INCLUDE_DIR}") @@ -109,13 +109,13 @@ IF(NOT SDL_BUILDING_LIBRARY) $ENV{SDLDIR} PATH_SUFFIXES lib64 lib PATHS - ${CMAKE_SOURCE_DIR}/packaging/windows/SDL/ /usr/local /usr /sw /opt/local /opt/csw /opt + ${CMAKE_SOURCE_DIR}/packaging/windows/SDL/ ) ENDIF(NOT ${SDL_INCLUDE_DIR} MATCHES ".framework") ENDIF(NOT SDL_BUILDING_LIBRARY) diff --git a/cmake/FindSDL_image.cmake b/cmake/FindSDL_image.cmake index 114924a..a6dddf6 100644 --- a/cmake/FindSDL_image.cmake +++ b/cmake/FindSDL_image.cmake @@ -30,13 +30,13 @@ FIND_PATH(SDLIMAGE_INCLUDE_DIR SDL_image.h /usr/include /sw/include/SDL # Fink /sw/include - ${CMAKE_SOURCE_DIR}/packaging/windows/SDL/include #tuxanci /opt/local/include/SDL # DarwinPorts /opt/local/include /opt/csw/include/SDL # Blastwave /opt/csw/include /opt/include/SDL /opt/include + ${CMAKE_SOURCE_DIR}/packaging/windows/SDL/include #tuxanci ) FIND_LIBRARY(SDLIMAGE_LIBRARY @@ -46,7 +46,6 @@ FIND_LIBRARY(SDLIMAGE_LIBRARY $ENV{SDLDIR} PATH_SUFFIXES lib64 lib PATHS - ${CMAKE_SOURCE_DIR}/packaging/windows/SDL/ ~/Library/Frameworks /Library/Frameworks /usr/local @@ -55,6 +54,7 @@ FIND_LIBRARY(SDLIMAGE_LIBRARY /opt/local /opt/csw /opt + ${CMAKE_SOURCE_DIR}/packaging/windows/SDL/ ) SET(SDLIMAGE_FOUND "NO") diff --git a/cmake/FindSDL_mixer.cmake b/cmake/FindSDL_mixer.cmake index b3bd845..f491d02 100644 --- a/cmake/FindSDL_mixer.cmake +++ b/cmake/FindSDL_mixer.cmake @@ -30,13 +30,13 @@ FIND_PATH(SDLMIXER_INCLUDE_DIR SDL_mixer.h /usr/include /sw/include/SDL # Fink /sw/include - ${CMAKE_SOURCE_DIR}/packaging/windows/SDL/include #tuxanci /opt/local/include/SDL # DarwinPorts /opt/local/include /opt/csw/include/SDL # Blastwave /opt/csw/include /opt/include/SDL /opt/include + ${CMAKE_SOURCE_DIR}/packaging/windows/SDL/include #tuxanci ) FIND_LIBRARY(SDLMIXER_LIBRARY @@ -46,7 +46,6 @@ FIND_LIBRARY(SDLMIXER_LIBRARY $ENV{SDLDIR} PATH_SUFFIXES lib64 lib PATHS - ${CMAKE_SOURCE_DIR}/packaging/windows/SDL/ ~/Library/Frameworks /Library/Frameworks /usr/local @@ -55,6 +54,7 @@ FIND_LIBRARY(SDLMIXER_LIBRARY /opt/local /opt/csw /opt + ${CMAKE_SOURCE_DIR}/packaging/windows/SDL/ ) SET(SDLMIXER_FOUND "NO") diff --git a/cmake/FindSDL_ttf.cmake b/cmake/FindSDL_ttf.cmake index 10ec40a..32dbbad 100644 --- a/cmake/FindSDL_ttf.cmake +++ b/cmake/FindSDL_ttf.cmake @@ -30,13 +30,13 @@ FIND_PATH(SDLTTF_INCLUDE_DIR SDL_ttf.h /usr/include /sw/include/SDL # Fink /sw/include - ${CMAKE_SOURCE_DIR}/packaging/windows/SDL/include #tuxanci /opt/local/include/SDL # DarwinPorts /opt/local/include /opt/csw/include/SDL # Blastwave /opt/csw/include /opt/include/SDL /opt/include + ${CMAKE_SOURCE_DIR}/packaging/windows/SDL/include #tuxanci ) FIND_LIBRARY(SDLTTF_LIBRARY @@ -45,7 +45,6 @@ FIND_LIBRARY(SDLTTF_LIBRARY $ENV{SDLTTFDIR} $ENV{SDLDIR} PATHS - ${CMAKE_SOURCE_DIR}/packaging/windows/SDL/ ~/Library/Frameworks /Library/Frameworks /usr/local @@ -54,6 +53,7 @@ FIND_LIBRARY(SDLTTF_LIBRARY /opt/local /opt/csw /opt + ${CMAKE_SOURCE_DIR}/packaging/windows/SDL/ PATH_SUFFIXES lib64 lib ) diff --git a/cmake/FindZIP.cmake b/cmake/FindZIP.cmake index e50aedf..bbc3765 100644 --- a/cmake/FindZIP.cmake +++ b/cmake/FindZIP.cmake @@ -12,18 +12,18 @@ IF(ZIP_LIBRARIES AND ZIP_INCLUDE_DIR) ELSE(ZIP_LIBRARIES AND ZIP_INCLUDE_DIR) FIND_PATH(ZIP_INCLUDE_DIR zip.h PATHS - ${CMAKE_SOURCE_DIR}/packaging/windows/LibZip/include /usr/local/include /usr/include + ${CMAKE_SOURCE_DIR}/packaging/windows/LibZip/include NO_DEFAULT_PATH ) FIND_LIBRARY(ZIP_LIBRARIES NAMES zip zip-1 PATH_SUFFIXES lib64 lib PATHS - ${CMAKE_SOURCE_DIR}/packaging/windows/LibZip/ /usr/local /usr + ${CMAKE_SOURCE_DIR}/packaging/windows/LibZip/ ) # handle the QUIETLY and REQUIRED arguments and set ZIP_FOUND to TRUE if -- cgit v1.2.3