Changeset 11239

Show
Ignore:
Timestamp:
03/17/10 15:36:16 (5 years ago)
Author:
robert
Message:

From J.P. Delport, "attached an updated FindGDAL that finds 1.6.0 version in Debian unstable. Could also be added to VPB.

Also some misc spelling fixes in CMakeLists.txt"

Location:
OpenSceneGraph/trunk
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/CMakeLists.txt

    r11221 r11239  
    888888        SET(OSG_LIBPATH_MESSAGE_HAS_BEEN_RUN_BEFORE 1 CACHE INTERNAL "Flag to track whether the libpath message has been reported before") 
    889889 
    890         MESSAGE("\nThe build system is configured to instal libraries to ${CMAKE_INSTALL_PREFIX}/lib${LIB_POSTFIX}\n" 
     890        MESSAGE("\nThe build system is configured to install libraries to ${CMAKE_INSTALL_PREFIX}/lib${LIB_POSTFIX}\n" 
    891891            "Your applications may not be able to find your installed libraries unless you:\n" 
    892892            "    set your LD_LIBRARY_PATH (user specific) or\n" 
     
    894894        IF(IS_DIRECTORY /etc/ld.so.conf.d) 
    895895            MESSAGE("You have an ld.so.conf.d directory on your system, so if you wish to ensure that\n" 
    896                 "applications find the installed osg libraries, system wide, you could install a\n" 
    897                 "openscenegraph specific ld.so configuration with:\n" 
     896                "applications find the installed osg libraries, system wide, you could install an\n" 
     897                "OpenSceneGraph specific ld.so configuration with:\n" 
    898898                "    sudo make install_ld_conf\n") 
    899899            CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/packaging/ld.so.conf.d/openscenegraph.conf.in 
  • OpenSceneGraph/trunk/CMakeModules/FindGDAL.cmake

    r9260 r11239  
    5858 
    5959FIND_LIBRARY(GDAL_LIBRARY  
    60   NAMES gdal gdal_i gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL 
     60  NAMES gdal gdal_i gdal1.6.0 gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL 
    6161  PATHS 
    6262  $ENV{GDAL_DIR} 
     
    6565) 
    6666FIND_LIBRARY(GDAL_LIBRARY  
    67   NAMES gdal gdal_i gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL 
     67  NAMES gdal gdal_i gdal1.6.0 gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL 
    6868  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this. 
    6969    NO_DEFAULT_PATH 
     
    7171) 
    7272FIND_LIBRARY(GDAL_LIBRARY  
    73   NAMES gdal gdal_i gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL 
     73  NAMES gdal gdal_i gdal1.6.0 gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL 
    7474  PATHS 
    7575    ~/Library/Frameworks