Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of github.com:qgis/Quantum-GIS
- Loading branch information
Showing
238 changed files
with
3,730 additions
and
343 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,101 @@ | ||
# This module defines | ||
|
||
# OSGEARTH_LIBRARY | ||
# OSGEARTH_FOUND, if false, do not try to link to osg | ||
# OSGEARTH_INCLUDE_DIRS, where to find the headers | ||
# OSGEARTH_INCLUDE_DIR, where to find the source headers | ||
# OSGEARTH_GEN_INCLUDE_DIR, where to find the generated headers | ||
|
||
# to use this module, set variables to point to the osg build | ||
# directory, and source directory, respectively | ||
# OSGEARTHDIR or OSGEARTH_SOURCE_DIR: osg source directory, typically OpenSceneGraph | ||
# OSGEARTH_DIR or OSGEARTH_BUILD_DIR: osg build directory, place in which you've | ||
# built osg via cmake | ||
|
||
# Header files are presumed to be included like | ||
# #include <osgEarth/Common> | ||
# #include <osgEarth/TileSource> | ||
|
||
###### headers ###### | ||
|
||
MACRO( FIND_OSGEARTH_INCLUDE THIS_OSGEARTH_INCLUDE_DIR THIS_OSGEARTH_INCLUDE_FILE ) | ||
|
||
FIND_PATH( ${THIS_OSGEARTH_INCLUDE_DIR} ${THIS_OSGEARTH_INCLUDE_FILE} | ||
PATHS | ||
${OSGEARTH_DIR} | ||
$ENV{OSGEARTH_SOURCE_DIR} | ||
$ENV{OSGEARTHDIR} | ||
$ENV{OSGEARTH_DIR} | ||
/usr/local/ | ||
/usr/ | ||
/sw/ # Fink | ||
/opt/local/ # DarwinPorts | ||
/opt/csw/ # Blastwave | ||
/opt/ | ||
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSGEARTH_ROOT]/ | ||
~/Library/Frameworks | ||
/Library/Frameworks | ||
PATH_SUFFIXES | ||
/include/ | ||
) | ||
|
||
ENDMACRO( FIND_OSGEARTH_INCLUDE THIS_OSGEARTH_INCLUDE_DIR THIS_OSGEARTH_INCLUDE_FILE ) | ||
|
||
FIND_OSGEARTH_INCLUDE( OSGEARTH_GEN_INCLUDE_DIR osgEarth/Common ) | ||
FIND_OSGEARTH_INCLUDE( OSGEARTH_INCLUDE_DIR osgEarth/TileSource ) | ||
|
||
###### libraries ###### | ||
|
||
MACRO( FIND_OSGEARTH_LIBRARY MYLIBRARY MYLIBRARYNAME ) | ||
|
||
FIND_LIBRARY(${MYLIBRARY} | ||
NAMES | ||
${MYLIBRARYNAME} | ||
PATHS | ||
${OSGEARTH_DIR} | ||
$ENV{OSGEARTH_BUILD_DIR} | ||
$ENV{OSGEARTH_DIR} | ||
$ENV{OSGEARTHDIR} | ||
$ENV{OSGEARTH_ROOT} | ||
~/Library/Frameworks | ||
/Library/Frameworks | ||
/usr/local | ||
/usr | ||
/sw | ||
/opt/local | ||
/opt/csw | ||
/opt | ||
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSGEARTH_ROOT]/lib | ||
/usr/freeware | ||
PATH_SUFFIXES | ||
/lib/ | ||
/lib64/ | ||
/build/lib/ | ||
/build/lib64/ | ||
/Build/lib/ | ||
/Build/lib64/ | ||
) | ||
|
||
ENDMACRO(FIND_OSGEARTH_LIBRARY LIBRARY LIBRARYNAME) | ||
|
||
FIND_OSGEARTH_LIBRARY( OSGEARTH_LIBRARY osgEarth ) | ||
FIND_OSGEARTH_LIBRARY( OSGEARTH_LIBRARY_DEBUG osgEarthd) | ||
|
||
FIND_OSGEARTH_LIBRARY( OSGEARTHUTIL_LIBRARY osgEarthUtil ) | ||
FIND_OSGEARTH_LIBRARY( OSGEARTHUTIL_LIBRARY_DEBUG osgEarthUtild) | ||
|
||
FIND_OSGEARTH_LIBRARY( OSGEARTHFEATURES_LIBRARY osgEarthFeatures ) | ||
FIND_OSGEARTH_LIBRARY( OSGEARTHFEATURES_LIBRARY_DEBUG osgEarthFeaturesd) | ||
|
||
FIND_OSGEARTH_LIBRARY( OSGEARTHSYMBOLOGY_LIBRARY osgEarthSymbology ) | ||
FIND_OSGEARTH_LIBRARY( OSGEARTHSYMBOLOGY_LIBRARY_DEBUG osgEarthSymbologyd ) | ||
|
||
|
||
SET( OSGEARTH_FOUND "NO" ) | ||
IF( OSGEARTH_LIBRARY AND OSGEARTH_INCLUDE_DIR ) | ||
SET( OSGEARTH_FOUND "YES" ) | ||
SET( OSGEARTH_INCLUDE_DIRS ${OSGEARTH_INCLUDE_DIR} ${OSGEARTH_GEN_INCLUDE_DIR} ) | ||
GET_FILENAME_COMPONENT( OSGEARTH_LIBRARIES_DIR ${OSGEARTH_LIBRARY} PATH ) | ||
ENDIF( OSGEARTH_LIBRARY AND OSGEARTH_INCLUDE_DIR ) | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,13 @@ | ||
|
||
FILE (GLOB IMAGES *.png) | ||
INSTALL (FILES ${IMAGES} | ||
DESTINATION ${QGIS_DATA_DIR}/images/icons) | ||
|
||
IF(MSVC) | ||
INSTALL(FILES qgis.ico DESTINATION ${CMAKE_INSTALL_PREFIX}/icons) | ||
ENDIF(MSVC) | ||
|
||
# OS X app/doc icons | ||
IF (APPLE) | ||
ADD_SUBDIRECTORY(mac) | ||
ENDIF (APPLE) | ||
|
||
FILE (GLOB IMAGES *.png) | ||
INSTALL (FILES ${IMAGES} | ||
DESTINATION ${QGIS_DATA_DIR}/images/icons) | ||
|
||
IF(MSVC) | ||
INSTALL(FILES qgis.ico DESTINATION ${CMAKE_INSTALL_PREFIX}/icons) | ||
ENDIF(MSVC) | ||
|
||
# OS X app/doc icons | ||
IF (APPLE) | ||
ADD_SUBDIRECTORY(mac) | ||
ENDIF (APPLE) |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.