From 031aaf23d006a59c9e303e5c75f663c95333bd57 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 17 Mar 2010 14:36:16 +0000 Subject: [PATCH] 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" --- CMakeLists.txt | 6 +++--- CMakeModules/FindGDAL.cmake | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4df175ed4..36d368dcc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -887,14 +887,14 @@ IF(REQUIRES_LIBPATH_MESSAGE) IF (NOT OSG_LIBPATH_MESSAGE_HAS_BEEN_RUN_BEFORE) SET(OSG_LIBPATH_MESSAGE_HAS_BEEN_RUN_BEFORE 1 CACHE INTERNAL "Flag to track whether the libpath message has been reported before") - MESSAGE("\nThe build system is configured to instal libraries to ${CMAKE_INSTALL_PREFIX}/lib${LIB_POSTFIX}\n" + MESSAGE("\nThe build system is configured to install libraries to ${CMAKE_INSTALL_PREFIX}/lib${LIB_POSTFIX}\n" "Your applications may not be able to find your installed libraries unless you:\n" " set your LD_LIBRARY_PATH (user specific) or\n" " update your ld.so configuration (system wide)") IF(IS_DIRECTORY /etc/ld.so.conf.d) MESSAGE("You have an ld.so.conf.d directory on your system, so if you wish to ensure that\n" - "applications find the installed osg libraries, system wide, you could install a\n" - "openscenegraph specific ld.so configuration with:\n" + "applications find the installed osg libraries, system wide, you could install an\n" + "OpenSceneGraph specific ld.so configuration with:\n" " sudo make install_ld_conf\n") CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/packaging/ld.so.conf.d/openscenegraph.conf.in ${PROJECT_BINARY_DIR}/packaging/ld.so.conf.d/openscenegraph.conf diff --git a/CMakeModules/FindGDAL.cmake b/CMakeModules/FindGDAL.cmake index 4070baf0d..44dc1b68e 100644 --- a/CMakeModules/FindGDAL.cmake +++ b/CMakeModules/FindGDAL.cmake @@ -57,20 +57,20 @@ FIND_PATH(GDAL_INCLUDE_DIR gdal.h ) FIND_LIBRARY(GDAL_LIBRARY - NAMES gdal gdal_i gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL + NAMES gdal gdal_i gdal1.6.0 gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL PATHS $ENV{GDAL_DIR} NO_DEFAULT_PATH PATH_SUFFIXES lib64 lib ) FIND_LIBRARY(GDAL_LIBRARY - NAMES gdal gdal_i gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL + NAMES gdal gdal_i gdal1.6.0 gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this. NO_DEFAULT_PATH PATH_SUFFIXES lib64 lib ) FIND_LIBRARY(GDAL_LIBRARY - NAMES gdal gdal_i gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL + NAMES gdal gdal_i gdal1.6.0 gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL PATHS ~/Library/Frameworks /Library/Frameworks