Android用ビルド対応 (Synesthesias#145)

* first try

* second try

* simplify conditions for if

* Update submodule

Author: wyasuda

3rdparty/glTF-SDK/CMakeLists.txt

@@ -1,11 +1,11 @@
 cmake_minimum_required(VERSION 3.5)
 project (GLTFSDK)
 
-if(UNIX AND NOT APPLE)
+if( (UNIX AND NOT APPLE) AND (NOT ANDROID) )
     link_libraries(stdc++fs)
 endif()
 
-if(NOT CMAKE_SYSTEM_NAME STREQUAL "iOS")
+if( NOT(IOS OR ANDROID) )
     option(ENABLE_UNIT_TESTS "ENABLE_UNIT_TESTS" ON)
 else()
     option(ENABLE_UNIT_TESTS "ENABLE_UNIT_TESTS" OFF)
@@ -16,7 +16,7 @@ endif()
 
 # Disable the samples on macOS, iOS, and Android since the experimental features they use
 # do not yet build with XCode or clang on these platforms.
-if(APPLE OR ANDROID_OS_PLATFORM)
+if(APPLE OR ANDROID)
     option(ENABLE_SAMPLES "ENABLE_SAMPLES" OFF)
 else()
     option(ENABLE_SAMPLES "ENABLE_SAMPLES" ON)

3rdparty/libcitygml

@@ -68,7 +68,7 @@ endif()
 add_compile_options("$<$<C_COMPILER_ID:MSVC>:/utf-8>")
 add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/utf-8>")
 
-if(NOT CMAKE_SYSTEM_NAME STREQUAL "iOS")
+if( NOT(IOS OR ANDROID) )
   ## ユニットテスト
   add_subdirectory("test")
 
@@ -95,7 +95,7 @@ set(LIBCITYGML_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/libcitygml/sources/
 add_subdirectory("3rdparty/glTF-SDK")
 set(GLTFSDK_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/glTF-SDK/glTF-SDK/GLTFSDK/Inc")
 
-if(NOT CMAKE_SYSTEM_NAME STREQUAL "iOS")
+if( NOT(IOS OR ANDROID) )
   # FBX SDK 以下のディレクトリで debug と release のどちらを利用するか決めます。
   # debug なら debug/*-md.lib を使い、release なら release/*-mt.lib を使います。
   if(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
@@ -180,7 +180,7 @@ add_subdirectory("3rdparty/openssl-cmake")
 # libplateau をビルドします。
 add_subdirectory("src")
 
-if(NOT CMAKE_SYSTEM_NAME STREQUAL "iOS")
+if( NOT(IOS OR ANDROID) )
   ## Examples
   add_subdirectory("examples/log_skipped_elements")
   add_subdirectory("examples/export_obj")
@@ -198,7 +198,7 @@ endif(BUILD_PYTHON)
 # Copy data for testing
 file(COPY data/ DESTINATION "${CMAKE_BINARY_DIR}/data")
 
-if(CMAKE_SYSTEM_NAME STREQUAL "iOS")
+if(IOS)
   set_target_properties(ssl PROPERTIES
     XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED "NO"
     XCODE_ATTRIBUTE_ENABLE_BITCODE "NO"

CMakeLists.txt

@@ -1,7 +1,7 @@
 add_compile_definitions(LIBPLATEAU_BUILD)
 
 add_library(plateau SHARED "")
-if(NOT CMAKE_SYSTEM_NAME STREQUAL "iOS")
+if( NOT(IOS OR ANDROID) )
   target_link_libraries(plateau PUBLIC citygml xerces-c GLTFSDK crypto ssl "${FBXSDK_LIBRARIES}" LibXml2 "${ZLIB_LIBRARY}" c_wrapper)
   target_include_directories(plateau PUBLIC "${CMAKE_SOURCE_DIR}/include" "${LIBCITYGML_INCLUDE}" "${GLTFSDK_INCLUDE}" "${CPPHTTPLIB_INCLUDE}" "${FBXSDK_INCLUDE}")
 else()

src/CMakeLists.txt

@@ -1,4 +1,4 @@
-if(CMAKE_SYSTEM_NAME STREQUAL "iOS")
+if( IOS OR ANDROID)
   target_sources(plateau PRIVATE
       "obj_writer.cpp"
       "gltf_writer.cpp"