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

From Thomas Hogarth, "Attached are two minor modifications to the master CMakeLists.txt file.

Browse Source 
It now points to sdk version 6.0 (I do intend to make this configurable my command line)

It also added a search for libtiff to Apple builds mainly for use with osg earth."
This commit is contained in:
Robert Osfield 2013-01-25 16:54:30 +00:00
parent 26a8f63212
commit 0e7ae7319b
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -233,7 +233,7 @@ IF(APPLE)
IF(OSG_BUILD_PLATFORM_IPHONE OR OSG_BUILD_PLATFORM_IPHONE_SIMULATOR) IF(OSG_BUILD_PLATFORM_IPHONE OR OSG_BUILD_PLATFORM_IPHONE_SIMULATOR)
#you need to manually set the default sdk version here #you need to manually set the default sdk version here
SET (IPHONE_SDKVER "5.1" CACHE STRING "IOS SDK-Version") SET (IPHONE_SDKVER "6.0" CACHE STRING "IOS SDK-Version")
#the below is taken from ogre, it states the gcc stuff needs to happen before PROJECT() is called. I've no clue if we even need it #the below is taken from ogre, it states the gcc stuff needs to happen before PROJECT() is called. I've no clue if we even need it
# Force gcc <= 4.2 on iPhone # Force gcc <= 4.2 on iPhone
@ -591,6 +591,7 @@ IF(NOT ANDROID)
ENDIF() ENDIF()
ELSE() ELSE()
FIND_PACKAGE(TIFF)
FIND_PACKAGE(QuickTime) FIND_PACKAGE(QuickTime)
FIND_PACKAGE(QTKit) FIND_PACKAGE(QTKit)
FIND_PACKAGE(CoreVideo) FIND_PACKAGE(CoreVideo)