FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Also some misc spelling fixes in CMakeLists.txt"
This commit is contained in:
Robert Osfield 2010-03-17 14:36:16 +00:00
parent 28105bacc1
commit 031aaf23d0
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -887,14 +887,14 @@ IF(REQUIRES_LIBPATH_MESSAGE)
IF (NOT OSG_LIBPATH_MESSAGE_HAS_BEEN_RUN_BEFORE) 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") 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" "Your applications may not be able to find your installed libraries unless you:\n"
" set your LD_LIBRARY_PATH (user specific) or\n" " set your LD_LIBRARY_PATH (user specific) or\n"
" update your ld.so configuration (system wide)") " update your ld.so configuration (system wide)")
IF(IS_DIRECTORY /etc/ld.so.conf.d) 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" 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" "applications find the installed osg libraries, system wide, you could install an\n"
"openscenegraph specific ld.so configuration with:\n" "OpenSceneGraph specific ld.so configuration with:\n"
" sudo make install_ld_conf\n") " sudo make install_ld_conf\n")
CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/packaging/ld.so.conf.d/openscenegraph.conf.in CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/packaging/ld.so.conf.d/openscenegraph.conf.in
${PROJECT_BINARY_DIR}/packaging/ld.so.conf.d/openscenegraph.conf ${PROJECT_BINARY_DIR}/packaging/ld.so.conf.d/openscenegraph.conf

6
CMakeModules/FindGDAL.cmake
View File

@ -57,20 +57,20 @@ FIND_PATH(GDAL_INCLUDE_DIR gdal.h
) )
FIND_LIBRARY(GDAL_LIBRARY 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 PATHS
$ENV{GDAL_DIR} $ENV{GDAL_DIR}
NO_DEFAULT_PATH NO_DEFAULT_PATH
PATH_SUFFIXES lib64 lib PATH_SUFFIXES lib64 lib
) )
FIND_LIBRARY(GDAL_LIBRARY 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. PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
NO_DEFAULT_PATH NO_DEFAULT_PATH
PATH_SUFFIXES lib64 lib PATH_SUFFIXES lib64 lib
) )
FIND_LIBRARY(GDAL_LIBRARY 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 PATHS
~/Library/Frameworks ~/Library/Frameworks
/Library/Frameworks /Library/Frameworks