Changeset Navigation

← Previous Changeset
Next Changeset →

Changeset 920

Timestamp:

07/18/08 11:39:02

Author:

robert

Message:

From Bob Kuehne, added support for non installed, out of source builds of the OpenSceneGraph?.

Files:

trunk/CMakeModules/FindGDAL.cmake (modified) (3 diffs)
trunk/CMakeModules/FindOSG.cmake (modified) (1 diff)
trunk/applications/osgdem/CMakeLists.txt (modified) (1 diff)
trunk/applications/vpbcache/CMakeLists.txt (modified) (1 diff)
trunk/applications/vpbmaster/CMakeLists.txt (modified) (1 diff)
trunk/applications/vpbsizes/CMakeLists.txt (modified) (1 diff)
trunk/src/vpb/CMakeLists.txt (modified) (1 diff)
trunk/src/vpb/FileUtils.cpp (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/CMakeModules/FindGDAL.cmake

r893	r920
54	54	/opt/include/GDAL
55	55	/opt/include
	56	c:/Program Files/FWTools2.1.0/include
56	57	)
57	58
…	…
59	60	NAMES gdal gdal_i gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL
60	61	PATHS
	62	c:/Program Files/FWTools2.1.0/lib
61	63	$ENV{GDAL_DIR}
62	64	NO_DEFAULT_PATH
…	…
66	68	NAMES gdal gdal_i gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL
67	69	PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
	70	c:/Program Files/FWTools2.1.0/lib
68	71	NO_DEFAULT_PATH
69	72	PATH_SUFFIXES lib64 lib

trunk/CMakeModules/FindOSG.cmake

r828	r920
1		~~# Locate gdal~~
2	1	# This module defines
	2
3	3	# OSG_LIBRARY
4		# OSG_FOUND, if false, do not try to link to gdal
5		# OSG_INCLUDE_DIR, where to find the headers
6		#
7		# $OSG_DIR is an environment variable that would
8		# correspond to the ./configure --prefix=$OSG_DIR
9		#
10		# Created by Robert Osfield.
	4	# OSG_FOUND, if false, do not try to link to osg
	5	# OSG_INCLUDE_DIRS, where to find the headers
	6	# OSG_INCLUDE_DIR, where to find the source headers
	7	# OSG_GEN_INCLUDE_DIR, where to find the generated headers
11	8
12		FIND_PATH(OSG_INCLUDE_DIR osg/Node
13		${OSG_DIR}/include
14		$ENV{OSG_DIR}/include
15		$ENV{OSG_DIR}
16		$ENV{OSGDIR}/include
17		$ENV{OSGDIR}
18		$ENV{OSG_ROOT}/include
19		~/Library/Frameworks
20		/Library/Frameworks
21		/usr/local/include
22		/usr/include
23		/sw/include # Fink
24		/opt/local/include # DarwinPorts
25		/opt/csw/include # Blastwave
26		/opt/include
27		[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
28		/usr/freeware/include
	9	# to use this module, set variables to point to the osg build
	10	# directory, and source directory, respectively
	11	# OSGDIR or OSG_SOURCE_DIR: osg source directory, typically OpenSceneGraph
	12	# OSG_DIR or OSG_BUILD_DIR: osg build directory, place in which you've
	13	# built osg via cmake
	14
	15	# Header files are presumed to be included like
	16	# #include <osg/PositionAttitudeTransform>
	17	# #include <osgUtil/SceneView>
	18
	19	###### headers ######
	20
	21	MACRO( FIND_OSG_INCLUDE THIS_OSG_INCLUDE_DIR THIS_OSG_INCLUDE_FILE )
	22
	23	FIND_PATH( ${THIS_OSG_INCLUDE_DIR} ${THIS_OSG_INCLUDE_FILE}
	24	PATHS
	25	$ENV{OSG_SOURCE_DIR}
	26	$ENV{OSGDIR}
	27	$ENV{OSG_DIR}
	28	/usr/local/
	29	/usr/
	30	/sw/ # Fink
	31	/opt/local/ # DarwinPorts
	32	/opt/csw/ # Blastwave
	33	/opt/
	34	[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/
	35	~/Library/Frameworks
	36	/Library/Frameworks
	37	PATH_SUFFIXES
	38	/include/
29	39	)
30	40
31		~~MACRO(FIND_OSG_LIBRARY MYLIBRARY MYLIBRARYNAME~~)
	41	ENDMACRO( FIND_OSG_INCLUDE THIS_OSG_INCLUDE_DIR THIS_OSG_INCLUDE_FILE )
32	42
33		FIND_LIBRARY("${MYLIBRARY}_DEBUG"
34		NAMES "${MYLIBRARYNAME}${CMAKE_DEBUG_POSTFIX}"
35		PATHS
36		${OSG_DIR}/lib/Debug
37		${OSG_DIR}/lib
38		$ENV{OSG_DIR}/lib/debug
39		$ENV{OSG_DIR}/lib
	43	FIND_OSG_INCLUDE( OSG_GEN_INCLUDE_DIR osg/Config )
	44	FIND_OSG_INCLUDE( OSG_INCLUDE_DIR osg/Node )
	45
	46	###### libraries ######
	47
	48	MACRO( FIND_OSG_LIBRARY MYLIBRARY MYLIBRARYNAME )
	49
	50	FIND_LIBRARY(${MYLIBRARY}
	51	NAMES
	52	${MYLIBRARYNAME}
	53	PATHS
	54	$ENV{OSG_BUILD_DIR}
40	55	$ENV{OSG_DIR}
41		~~$ENV{OSGDIR}/lib~~
42	56	$ENV{OSGDIR}
43		$ENV{OSG_ROOT}~~/lib~~
	57	$ENV{OSG_ROOT}
44	58	~/Library/Frameworks
45	59	/Library/Frameworks
46		/usr/local/lib
47		/usr/local/lib64
48		/usr/lib
49		/usr/lib64
50		/sw/lib
51		/opt/local/lib
52		/opt/csw/lib
53		/opt/lib
	60	/usr/local
	61	/usr
	62	/sw
	63	/opt/local
	64	/opt/csw
	65	/opt
54	66	[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
55		/usr/freeware/lib64
56		)
	67	/usr/freeware
	68	PATH_SUFFIXES
	69	/lib/
	70	/lib64/
	71	/build/lib/
	72	/build/lib64/
	73	/Build/lib/
	74	/Build/lib64/
	75	)
57	76
58		~~FIND_LIBRARY(${MYLIBRARY}~~
59		~~NAMES ${MYLIBRARYNAME}~~
60		~~PATHS~~
61		~~${OSG_DIR}/lib/Release~~
62		~~${OSG_DIR}/lib~~
63		~~$ENV{OSG_DIR}/lib/Release~~
64		~~$ENV{OSG_DIR}/lib~~
65		~~$ENV{OSG_DIR}~~
66		~~$ENV{OSGDIR}/lib~~
67		~~$ENV{OSGDIR}~~
68		~~$ENV{OSG_ROOT}/lib~~
69		~~~/Library/Frameworks~~
70		~~/Library/Frameworks~~
71		~~/usr/local/lib~~
72		~~/usr/local/lib64~~
73		~~/usr/lib~~
74		~~/usr/lib64~~
75		~~/sw/lib~~
76		~~/opt/local/lib~~
77		~~/opt/csw/lib~~
78		~~/opt/lib~~
79		~~[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib~~
80		~~/usr/freeware/lib64~~
81		)
82		~~IF( NOT ${MYLIBRARY}_DEBUG)~~
83		~~IF(MYLIBRARY)~~
84		~~SET(${MYLIBRARY}_DEBUG ${MYLIBRARY})~~
85		~~ENDIF(MYLIBRARY)~~
86		~~ENDIF( NOT ${MYLIBRARY}_DEBUG)~~
87
88	77	ENDMACRO(FIND_OSG_LIBRARY LIBRARY LIBRARYNAME)
89	78
90		FIND_OSG_LIBRARY(OSG_LIBRARY osg)
91		FIND_OSG_LIBRARY(OSGUTIL_LIBRARY osgUtil)
92		FIND_OSG_LIBRARY(OSGDB_LIBRARY osgDB)
93		FIND_OSG_LIBRARY(OSGSIM_LIBRARY osgSim)
94		FIND_OSG_LIBRARY(OSGTEXT_LIBRARY osgText)
95		FIND_OSG_LIBRARY(OSGTERRAIN_LIBRARY osgTerrain)
96		FIND_OSG_LIBRARY(OSGFX_LIBRARY osgFX)
	79	FIND_OSG_LIBRARY( OSG_LIBRARY osg )
	80	FIND_OSG_LIBRARY( OSGUTIL_LIBRARY osgUtil )
	81	FIND_OSG_LIBRARY( OSGDB_LIBRARY osgDB )
	82	FIND_OSG_LIBRARY( OSGTEXT_LIBRARY osgText )
	83	FIND_OSG_LIBRARY( OSGTERRAIN_LIBRARY osgTerrain )
	84	FIND_OSG_LIBRARY( OSGFX_LIBRARY osgFX )
	85	FIND_OSG_LIBRARY( OSGSIM_LIBRARY osgSim )
	86	FIND_OSG_LIBRARY( OSGVIEWER_LIBRARY osgViewer )
97	87	FIND_OSG_LIBRARY(OSGGA_LIBRARY osgGA)
98		~~FIND_OSG_LIBRARY(OSGVIEWER_LIBRARY osgViewer)~~
99	88	FIND_OSG_LIBRARY(OPENTHREADS_LIBRARY OpenThreads)
100	89
101		SET(OSG_FOUND "NO")
102		IF(OSG_LIBRARY AND OSG_INCLUDE_DIR)
103		SET(OSG_FOUND "YES")
104		ENDIF(OSG_LIBRARY AND OSG_INCLUDE_DIR)
	90	MESSAGE( "--=====>>>> $ENV{OSG_DIR}")
	91	MESSAGE( "--=====>>>> $ENV{OSGDIR}")
	92	SET( OSG_FOUND "NO" )
	93	IF( OSG_LIBRARY AND OSG_INCLUDE_DIR )
	94	SET( OSG_FOUND "YES" )
	95	SET( OSG_INCLUDE_DIRS ${OSG_INCLUDE_DIR} ${OSG_GEN_INCLUDE_DIR} )
	96	GET_FILENAME_COMPONENT( OSG_LIBRARIES_DIR ${OSG_LIBRARY} PATH )
	97	ENDIF( OSG_LIBRARY AND OSG_INCLUDE_DIR )
	98	MESSAGE( "--=====>>>> ${OSG_INCLUDE_DIRS}")
	99
	100

trunk/applications/osgdem/CMakeLists.txt

r631	r920
1	1	#this file is automatically generated
2	2
3		INCLUDE_DIRECTORIES( ~~${GDAL_INCLUDE_DIR} ${OSG_INCLUDE_DIR~~} )
	3	INCLUDE_DIRECTORIES(${GDAL_INCLUDE_DIR} ${OSG_INCLUDE_DIRS} )
4	4	SET(TARGET_LIBRARIES_VARS GDAL_LIBRARY OSG_LIBRARY OSGVIEWER_LIBRARY )
5	5

trunk/applications/vpbcache/CMakeLists.txt

r751	r920
1	1	#this file is automatically generated
2	2
3		INCLUDE_DIRECTORIES( ~~${GDAL_INCLUDE_DIR} ${OSG_INCLUDE_DIR~~} )
	3	INCLUDE_DIRECTORIES(${GDAL_INCLUDE_DIR} ${OSG_INCLUDE_DIRS} )
4	4	SET(TARGET_LIBRARIES_VARS GDAL_LIBRARY OSG_LIBRARY OSGVIEWER_LIBRARY )
5	5

trunk/applications/vpbmaster/CMakeLists.txt

r675	r920
1	1	#this file is automatically generated
2	2
3		INCLUDE_DIRECTORIES( ~~${GDAL_INCLUDE_DIR} ${OSG_INCLUDE_DIR~~} )
	3	INCLUDE_DIRECTORIES(${GDAL_INCLUDE_DIR} ${OSG_INCLUDE_DIRS} )
4	4	SET(TARGET_LIBRARIES_VARS GDAL_LIBRARY OSG_LIBRARY OSGVIEWER_LIBRARY )
5	5

trunk/applications/vpbsizes/CMakeLists.txt

r670	r920
1	1	#this file is automatically generated
2	2
3		INCLUDE_DIRECTORIES( ~~${GDAL_INCLUDE_DIR} ${OSG_INCLUDE_DIR~~} )
	3	INCLUDE_DIRECTORIES(${GDAL_INCLUDE_DIR} ${OSG_INCLUDE_DIRS} )
4	4	SET(TARGET_LIBRARIES_VARS GDAL_LIBRARY OSG_LIBRARY OSGTERRAIN_LIBRARY OSGVIEWER_LIBRARY )
5	5

trunk/src/vpb/CMakeLists.txt

r905	r920
72	72	)
73	73
74		INCLUDE_DIRECTORIES( ~~${GDAL_INCLUDE_DIR} ${OSG_INCLUDE_DIR~~} )
	74	INCLUDE_DIRECTORIES(${GDAL_INCLUDE_DIR} ${OSG_INCLUDE_DIRS} )
75	75
76	76	IF (WIN32)

trunk/src/vpb/FileUtils.cpp

r912	r920
91	91	if (size>1)
92	92	{
	93	#if 0
	94	// proposed new code path to eliminate the need for outputting the c:/
	95	if (pos_current!=2 \|\| fullpath[1]!=':')
	96	directories.push_back(std::string(fullpath,0, pos_current));
	97	#else
93	98	if (pos_current == 2 && fullpath[1]==':')
94	99	directories.push_back(std::string(fullpath,0, pos_current+1));
95	100	else
96	101	directories.push_back(std::string(fullpath,0, pos_current));
	102	#endif
97	103	pos_start = pos_current+1;
98	104	}

Changeset Navigation

Changeset 920

Legend:

Download in other formats: