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

Improved iOS cmake support for xcode 9.4 and cmake 3.11

Browse Source
This commit is contained in:
Thomas Hogarth
2018-07-10 02:09:28 +01:00
committed by Colin Cochran
parent 47aa320787
commit e8ba57b22f
9 changed files with 75 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/OpenThreads/pthreads/CMakeLists.txt
View File

@@ -130,7 +130,7 @@ ELSE()
ENDIF()
IF(APPLE)
IF(OSG_BUILD_PLATFORM_IPHONE OR OSG_BUILD_PLATFORM_IPHONE_SIMULATOR)
IF(OSG_BUILD_PLATFORM_IPHONE)
SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES XCODE_ATTRIBUTE_ENABLE_BITCODE ${IPHONE_ENABLE_BITCODE})
ENDIF()
ENDIF()

2
src/osgDB/CMakeLists.txt
View File

@@ -126,7 +126,7 @@ SET(TARGET_SRC
)
IF(APPLE AND NOT ANDROID)
IF(NOT OSG_BUILD_PLATFORM_IPHONE AND NOT OSG_BUILD_PLATFORM_IPHONE_SIMULATOR)
IF(NOT OSG_BUILD_PLATFORM_IPHONE)
# Needs CoreFoundation calls and a Carbon function
SET(OSGDB_PLATFORM_SPECIFIC_LIBRARIES ${CARBON_LIBRARY} ${COCOA_LIBRARY})
ENDIF()

2
src/osgPlugins/freetype/CMakeLists.txt
View File

@@ -5,7 +5,7 @@ ENDIF()
INCLUDE_DIRECTORIES(${FREETYPE_INCLUDE_DIRS} )
IF(APPLE)
IF(NOT OSG_BUILD_PLATFORM_IPHONE AND NOT OSG_BUILD_PLATFORM_IPHONE_SIMULATOR)
IF(NOT OSG_BUILD_PLATFORM_IPHONE)
SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib")
ENDIF()
ENDIF()

8
src/osgPlugins/imageio/CMakeLists.txt
View File

@@ -1,11 +1,9 @@
SET(TARGET_SRC ReaderWriterImageIO.cpp )
IF (APPLE)
IF(OSG_BUILD_PLATFORM_IPHONE OR OSG_BUILD_PLATFORM_IPHONE_SIMULATOR)
# compile FileUtils.cpp as objective-c++
SET_SOURCE_FILES_PROPERTIES(ReaderWriterImageIO.cpp
PROPERTIES COMPILE_FLAGS "-x objective-c++"
)
IF(OSG_BUILD_PLATFORM_IPHONE)
# compile as objective-c++
SET_SOURCE_FILES_PROPERTIES(ReaderWriterImageIO.cpp PROPERTIES COMPILE_FLAGS "-x objective-c++")
ENDIF()
ENDIF()

2
src/osgViewer/CMakeLists.txt
View File

@@ -223,7 +223,7 @@ ELSE()
# X11 on Apple requires X11 library plus OpenGL linking hack on Leopard
IF(APPLE)
# hack for finding the iphone opengl es lib
IF(OSG_BUILD_PLATFORM_IPHONE OR OSG_BUILD_PLATFORM_IPHONE_SIMULATOR)
IF(OSG_BUILD_PLATFORM_IPHONE)
SET(OPENGL_INCLUDE_DIR ${IPHONE_SDKROOT}/System/Library/Frameworks)
SET(OPENGL_LIBRARIES ${IPHONE_SDKROOT}/System/Library/Frameworks/OpenGLES)
ELSE()