Merge branch 'master' into find-root-path-mode

Author: chlandsi

.gitignore

@@ -1,5 +1,4 @@
 # Project specific
-build/
 .DS_Store
 
 # Xcode
@@ -25,6 +24,7 @@ xcuserdata/
 *.moved-aside
 *.xccheckout
 *.xcscmblueprint
+.idea/
 
 ## Obj-C/Swift specific
 *.hmap

.travis.yml

@@ -4,25 +4,61 @@ matrix:
   fast_finish: true
   include:
     - os: osx
+      osx_image: xcode10.2
       compiler: clang
       env: 
         - IOS_PLATFORM=SIMULATOR
         - BUILD_SHARED=0
+        - USE_XCODE=0
     - os: osx
+      osx_image: xcode10.2
       compiler: clang
       env: 
         - IOS_PLATFORM=SIMULATOR64
         - BUILD_SHARED=0
+        - USE_XCODE=0
     - os: osx
+      osx_image: xcode10.2
       compiler: clang
       env: 
         - IOS_PLATFORM=OS
         - BUILD_SHARED=0
+        - USE_XCODE=0
     - os: osx
+      osx_image: xcode10.2
+      compiler: clang
+      env: 
+        - IOS_PLATFORM=OS64
+        - BUILD_SHARED=0
+        - USE_XCODE=0
+    - os: osx
+      osx_image: xcode10.2
       compiler: clang
       env: 
         - IOS_PLATFORM=OS
         - BUILD_SHARED=1
+        - USE_XCODE=0
+    - os: osx
+      osx_image: xcode10.2
+      compiler: clang
+      env:
+        - IOS_PLATFORM=TVOS
+        - BUILD_SHARED=0
+        - USE_XCODE=0
+    - os: osx
+      osx_image: xcode10.2
+      compiler: clang
+      env:
+        - IOS_PLATFORM=WATCHOS
+        - BUILD_SHARED=0
+        - USE_XCODE=0
+    - os: osx
+      osx_image: xcode10.2
+      compiler: clang
+      env:
+        - IOS_PLATFORM=OS64COMBINED
+        - BUILD_SHARED=0
+        - USE_XCODE=1
 
 install: true
 

.travis/build.sh

@@ -8,9 +8,13 @@ if [[ $BUILD_SHARED -eq 1 ]]; then
     SHARED_EXT="-DBUILD_SHARED=1 -DENABLE_VISIBILITY=1"
 fi
 
+GENERATOR_EXT=""
+if [[ $USE_XCODE -eq 1 ]]; then
+    GENERATOR_EXT="-G Xcode"
+fi
+
 cmake .. \
-    -DCMAKE_TOOLCHAIN_FILE=../../ios.toolchain.cmake \
-    -DIOS_PLATFORM=$IOS_PLATFORM $SHARED_EXT\
+    $GENERATOR_EXT -DCMAKE_TOOLCHAIN_FILE=../../ios.toolchain.cmake \
+    -DPLATFORM=$IOS_PLATFORM $SHARED_EXT\
     || exit 1
-make -j2 || exit 1
-make install || exit 1
+cmake --build . --config Release --target install || exit 1

README.md

@@ -1,4 +1,11 @@
-A CMake toolchain file for iOS and tvOS development
+A CMake toolchain file for iOS, watchOS and tvOS development with full simulator support and toggable options!
+
+### NEW!
+* The toolchain now supports the new features introduced in CMake 3.14 that allows combined (FAT libraries) to be built.
+    * Please see below for the "COMBINED" options that will build a static, combined FAT library by default.
+* The `IOS_PLATFORM` argument have been renamed to `PLATFORM` to better align with how the toolchain will be used.
+    * `IOS_PLATFORM` argument still exists, but is deprecated.
+* MUCH better support for Xcode generated project on CMake 3.14+
 
 ios-cmake
 =========
@@ -10,28 +17,41 @@ Tested with the following combinations:
 * XCode 6.1.x, iOS SDK 8.1
 * XCode 8.2.x, iOS SDK 10.2
 * XCode 9.4.x, iOS SDK 11.4
+* XCode 10.2.x, iOS SDK 12.2
 
 # Example usage 
-**NOTE: The below commands will build for 64-bit simulator only. Change the `-DIOS_PLATFORM` to the applicable value if targeting another platform.**
+**NOTE: The below commands will build for 64-bit simulator only. Change the `-DPLATFORM` to the applicable value if targeting another platform.**
 
 ```bash
 cd example/example-lib
 mkdir build
 cd build
-cmake .. -DCMAKE_TOOLCHAIN_FILE=../../ios.toolchain.cmake -DIOS_PLATFORM=SIMULATOR64
-make
-make install
+cmake .. -G Xcode -DCMAKE_TOOLCHAIN_FILE=../../ios.toolchain.cmake -DPLATFORM=OS64COMBINED
+cmake --build . --config Release --target install
 ```
 
 This will build and install the library for the given IOS_PLATFORM.
 
 ## Options
 
-* Set `-DIOS_PLATFORM` to "SIMULATOR" to build for iOS simulator 32 bit (i386)
-* Set `-DIOS_PLATFORM` to "SIMULATOR64" (example above) to build for iOS simulator 64 bit (x86_64)
-* Set `-DIOS_PLATFORM` to "OS" to build for Device (armv7, armv7s, arm64)
-* Set `-DIOS_PLATFORM` to "TVOS" to build for tvOS (arm64)
-* Set `-DIOS_PLATFORM` to "SIMULATOR_TVOS" to build for tvOS Simulator (x86_64)
+* Set `-DPLATFORM` to "SIMULATOR" to build for iOS simulator 32 bit (i386) **DEPRECATED**
+* Set `-DPLATFORM` to "SIMULATOR64" (example above) to build for iOS simulator 64 bit (x86_64)
+* Set `-DPLATFORM` to "OS" to build for Device (armv7, armv7s, arm64)
+* Set `-DPLATFORM` to "OS64" to build for Device (arm64)
+* Set `-DPLATFORM` to "OS64COMBINED" to build for Device & Simulator (FAT lib) (arm64, x86_64)
+* Set `-DPLATFORM` to "TVOS" to build for tvOS (arm64)
+* Set `-DPLATFORM` to "TVOSCOMBINED" to build for tvOS & Simulator (arm64, x86_64)
+* Set `-DPLATFORM` to "SIMULATOR_TVOS" to build for tvOS Simulator (x86_64)
+* Set `-DPLATFORM` to "WATCHOS" to build for watchOS (armv7k, arm64_32)
+* Set `-DPLATFORM` to "WATCHOSCOMBINED" to build for watchOS & Simulator (armv7k, arm64_32, i386)
+* Set `-DPLATFORM` to "SIMULATOR_WATCHOS" to build for watchOS Simulator (i386)
+
+### COMBINED options
+The options called *COMBINED (OS64COMBINED, TVOSCOMBINED and WATCHOSCOMBINED) will build complete FAT-libraries for 
+the given platform. These FAT-libraries include slices for both device and simulator, making the distribution and 
+usage of the library much more simple!
+
+**NOTE: The COMBINED options _ONLY_ work with the Xcode generator (-G Xcode).** 
 
 ### Additional Options
 `-DENABLE_BITCODE=(BOOL)` - Enabled by default, specify FALSE or 0 to disable bitcode
@@ -40,13 +60,16 @@ This will build and install the library for the given IOS_PLATFORM.
 
 `-DENABLE_VISIBILITY=(BOOL)` - Disabled by default, specify TRUE or 1 to enable symbol visibility support
 
-`-DIOS_ARCH=(STRING)` - Valid values are: armv7, armv7s, arm64, i386, x86_64. By default it will build for all valid architectures based on `-DIOS_PLATFORM` (see above)
+`-DIOS_ARCH=(STRING)` - Valid values are: armv7, armv7s, arm64, i386, x86_64, armv7k, arm64_32. By default it will build for all valid architectures based on `-DPLATFORM` (see above)
 
-__*The resulting binary will consist of only one platform. To combine all platforms into the same fat-library, use the LIPO tool. More information on this is available on the net.*__
+__*To combine all platforms into the same FAT-library, either build any of the "*COMBINED*" platform types OR use the 
+LIPO tool. More information on how to combine libraries with LIPO is readily available on the net.*__
 
 ## Thanks To
 
 * [natbro](https://github.com/natbro) for adding tvOS support
+* [MSNexploder](https://github.com/MSNexploder) for adding OS64 and arm64e support
+* [garryyan](https://github.com/garryyan) for adding watchOS support
 
 ## Notes
 

example/example-app/example-lib/lib/libexample.a

@@ -2,22 +2,22 @@ cmake_minimum_required (VERSION 3.2)
 project (example-ios C CXX)
 
 # Includes
-include_directories (${example-ios_SOURCE_DIR})
+include_directories(${example-ios_SOURCE_DIR})
 
 # Source files
-set (SOURCES
+set(SOURCES
   HelloWorld.cpp
   HelloWorldIOS.mm
 )
 
 # Headers
-set (HEADERS
+set(HEADERS
   HelloWorld.hpp
   HelloWorldIOS.h
 )
 
 # Library
-if (BUILD_SHARED)
+if(BUILD_SHARED)
   add_library (example SHARED ${SOURCES} ${HEADERS})
   message(STATUS "Building shared version...")
 else()
@@ -26,15 +26,15 @@ else()
 endif()
 
 # Executable
-add_executable (helloworld main.cpp)
+#add_executable (helloworld main.cpp)
 
 # Link the library with the executable
-target_link_libraries(helloworld example)
+#target_link_libraries(helloworld example)
 
 # Debug symbols set in XCode project
-set_xcode_property (example GCC_GENERATE_DEBUGGING_SYMBOLS YES "All")
+set_xcode_property(example GCC_GENERATE_DEBUGGING_SYMBOLS YES "All")
 
 # Installation
-set (CMAKE_INSTALL_PREFIX "${example-ios_SOURCE_DIR}/../example-app/example-lib")
-install (TARGETS example helloworld DESTINATION lib)
+set(CMAKE_INSTALL_PREFIX "${example-ios_SOURCE_DIR}/../example-app/example-lib")
+install (TARGETS example DESTINATION lib)
 install (FILES ${HEADERS} DESTINATION include)