[Cmake-commits] [cmake-commits] lowman committed FindSDL.cmake 1.16 1.17

cmake-commits at cmake.org cmake-commits at cmake.org
Sat Jul 18 01:05:06 EDT 2009


Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv24680

Modified Files:
	FindSDL.cmake 
Log Message:
BUG: Fix include path detection with SDLDIR env var (issue #9086).
Also removed some superfluous search paths.


Index: FindSDL.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindSDL.cmake,v
retrieving revision 1.16
retrieving revision 1.17
diff -C 2 -d -r1.16 -r1.17
*** FindSDL.cmake	9 Jun 2008 20:04:06 -0000	1.16
--- FindSDL.cmake	18 Jul 2009 05:05:04 -0000	1.17
***************
*** 56,79 ****
    HINTS
    $ENV{SDLDIR}
!   PATH_SUFFIXES include
    PATHS
    ~/Library/Frameworks
    /Library/Frameworks
-   /usr/local/include/SDL
-   /usr/include/SDL
    /usr/local/include/SDL12
    /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
!   /opt/local/include
!   /opt/csw/include/SDL # Blastwave
!   /opt/csw/include 
!   /opt/include/SDL
!   /opt/include
  )
  #MESSAGE("SDL_INCLUDE_DIR is ${SDL_INCLUDE_DIR}")
--- 56,71 ----
    HINTS
    $ENV{SDLDIR}
!   PATH_SUFFIXES include/SDL include
    PATHS
    ~/Library/Frameworks
    /Library/Frameworks
    /usr/local/include/SDL12
    /usr/local/include/SDL11 # FreeBSD ports
    /usr/include/SDL12
    /usr/include/SDL11
!   /sw # Fink
!   /opt/local # DarwinPorts
!   /opt/csw # Blastwave
!   /opt
  )
  #MESSAGE("SDL_INCLUDE_DIR is ${SDL_INCLUDE_DIR}")
***************
*** 87,92 ****
    PATH_SUFFIXES lib64 lib
    PATHS
-   /usr/local
-   /usr
    /sw
    /opt/local
--- 79,82 ----
***************
*** 109,114 ****
        PATH_SUFFIXES lib64 lib
        PATHS
-       /usr/local
-       /usr
        /sw
        /opt/local
--- 99,102 ----



More information about the Cmake-commits mailing list