From c2f22be99abac1a10715ca92980dd352f4a2b237 Mon Sep 17 00:00:00 2001
From: Doron Adler <doron@glidetalk.com>
Date: Tue, 20 Mar 2018 13:46:03 +0200
Subject: [PATCH] Norod: Default build type is set as Release, no shared
 libraries

---
 CMakeLists.txt                           | 8 +++++++-
 port/iOS/IPHONEOS_ARM64_TOOLCHAIN.cmake  | 8 ++++++++
 port/iOS/IPHONEOS_ARMV6_TOOLCHAIN.cmake  | 8 ++++++++
 port/iOS/IPHONEOS_ARMV7S_TOOLCHAIN.cmake | 8 ++++++++
 port/iOS/IPHONEOS_ARMV7_TOOLCHAIN.cmake  | 8 ++++++++
 port/iOS/IPHONEOS_I386_TOOLCHAIN.cmake   | 8 ++++++++
 port/iOS/IPHONEOS_X86_64_TOOLCHAIN.cmake | 8 ++++++++
 port/iOS/build.sh                        | 6 +++---
 8 files changed, 58 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e48507e43..57f9e892f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,10 +39,16 @@ CMAKE_MINIMUM_REQUIRED( VERSION 2.8 )
 PROJECT( Assimp )
 
 # All supported options ###############################################
+
+if(NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE "Release")
+endif()
+
 OPTION( BUILD_SHARED_LIBS
   "Build package with shared libraries."
-  ON
+  OFF
 )
+
 OPTION( BUILD_FRAMEWORK
   "Build package as Mac OS X Framework bundle."
   OFF
diff --git a/port/iOS/IPHONEOS_ARM64_TOOLCHAIN.cmake b/port/iOS/IPHONEOS_ARM64_TOOLCHAIN.cmake
index 15c1cc172..4abcac764 100644
--- a/port/iOS/IPHONEOS_ARM64_TOOLCHAIN.cmake
+++ b/port/iOS/IPHONEOS_ARM64_TOOLCHAIN.cmake
@@ -5,6 +5,14 @@ SET (CMAKE_SYSTEM_NAME      "Darwin")
 SET (CMAKE_SYSTEM_PROCESSOR "arm64")
 SET (IOS TRUE)
 
+if(NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE "Release")
+endif()
+
+set(CMAKE_CXX_FLAGS "-Wall -Wextra")
+set(CMAKE_CXX_FLAGS_DEBUG "-g")
+set(CMAKE_CXX_FLAGS_RELEASE "-O3")
+
 SET (CMAKE_FIND_ROOT_PATH "${SDKROOT}" "${DEVROOT}")
 SET (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM  NEVER)
 SET (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY  ONLY)
diff --git a/port/iOS/IPHONEOS_ARMV6_TOOLCHAIN.cmake b/port/iOS/IPHONEOS_ARMV6_TOOLCHAIN.cmake
index 692fa2b55..5aa7f90f1 100644
--- a/port/iOS/IPHONEOS_ARMV6_TOOLCHAIN.cmake
+++ b/port/iOS/IPHONEOS_ARMV6_TOOLCHAIN.cmake
@@ -5,6 +5,14 @@ SET (CMAKE_SYSTEM_NAME      "Darwin")
 SET (CMAKE_SYSTEM_PROCESSOR "armv6")
 SET (IOS TRUE)
 
+if(NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE "Release")
+endif()
+
+set(CMAKE_CXX_FLAGS "-Wall -Wextra")
+set(CMAKE_CXX_FLAGS_DEBUG "-g")
+set(CMAKE_CXX_FLAGS_RELEASE "-O3")
+
 SET (CMAKE_FIND_ROOT_PATH "${SDKROOT}" "${DEVROOT}")
 SET (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM  NEVER)
 SET (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY  ONLY)
diff --git a/port/iOS/IPHONEOS_ARMV7S_TOOLCHAIN.cmake b/port/iOS/IPHONEOS_ARMV7S_TOOLCHAIN.cmake
index 0a708d963..d35bfce03 100644
--- a/port/iOS/IPHONEOS_ARMV7S_TOOLCHAIN.cmake
+++ b/port/iOS/IPHONEOS_ARMV7S_TOOLCHAIN.cmake
@@ -5,6 +5,14 @@ SET (CMAKE_SYSTEM_NAME      "Darwin")
 SET (CMAKE_SYSTEM_PROCESSOR "armv7s")
 SET (IOS TRUE)
 
+if(NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE "Release")
+endif()
+
+set(CMAKE_CXX_FLAGS "-Wall -Wextra")
+set(CMAKE_CXX_FLAGS_DEBUG "-g")
+set(CMAKE_CXX_FLAGS_RELEASE "-O3")
+
 SET (CMAKE_FIND_ROOT_PATH "${SDKROOT}" "${DEVROOT}")
 SET (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM  NEVER)
 SET (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY  ONLY)
diff --git a/port/iOS/IPHONEOS_ARMV7_TOOLCHAIN.cmake b/port/iOS/IPHONEOS_ARMV7_TOOLCHAIN.cmake
index 22fdde115..d563bb078 100644
--- a/port/iOS/IPHONEOS_ARMV7_TOOLCHAIN.cmake
+++ b/port/iOS/IPHONEOS_ARMV7_TOOLCHAIN.cmake
@@ -5,6 +5,14 @@ SET (CMAKE_SYSTEM_NAME      "Darwin")
 SET (CMAKE_SYSTEM_PROCESSOR "armv7")
 SET (IOS TRUE)
 
+if(NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE "Release")
+endif()
+
+set(CMAKE_CXX_FLAGS "-Wall -Wextra")
+set(CMAKE_CXX_FLAGS_DEBUG "-g")
+set(CMAKE_CXX_FLAGS_RELEASE "-O3")
+
 SET (CMAKE_FIND_ROOT_PATH "${SDKROOT}" "${DEVROOT}")
 SET (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM  NEVER)
 SET (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY  ONLY)
diff --git a/port/iOS/IPHONEOS_I386_TOOLCHAIN.cmake b/port/iOS/IPHONEOS_I386_TOOLCHAIN.cmake
index 217b4ed51..6d077567e 100644
--- a/port/iOS/IPHONEOS_I386_TOOLCHAIN.cmake
+++ b/port/iOS/IPHONEOS_I386_TOOLCHAIN.cmake
@@ -5,6 +5,14 @@ SET (CMAKE_SYSTEM_NAME      "Darwin")
 SET (CMAKE_SYSTEM_PROCESSOR "i386")
 SET (IOS TRUE)
 
+if(NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE "Release")
+endif()
+
+set(CMAKE_CXX_FLAGS "-Wall -Wextra")
+set(CMAKE_CXX_FLAGS_DEBUG "-g")
+set(CMAKE_CXX_FLAGS_RELEASE "-O3")
+
 SET (CMAKE_FIND_ROOT_PATH "${SDKROOT}" "${DEVROOT}")
 SET (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM  NEVER)
 SET (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY  ONLY)
diff --git a/port/iOS/IPHONEOS_X86_64_TOOLCHAIN.cmake b/port/iOS/IPHONEOS_X86_64_TOOLCHAIN.cmake
index e4b27fba4..354487ce0 100644
--- a/port/iOS/IPHONEOS_X86_64_TOOLCHAIN.cmake
+++ b/port/iOS/IPHONEOS_X86_64_TOOLCHAIN.cmake
@@ -5,6 +5,14 @@ SET (CMAKE_SYSTEM_NAME      "Darwin")
 SET (CMAKE_SYSTEM_PROCESSOR "x86_64")
 SET (IOS TRUE)
 
+if(NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE "Release")
+endif()
+
+set(CMAKE_CXX_FLAGS "-Wall -Wextra")
+set(CMAKE_CXX_FLAGS_DEBUG "-g")
+set(CMAKE_CXX_FLAGS_RELEASE "-O3")
+
 SET (CMAKE_FIND_ROOT_PATH "${SDKROOT}" "${DEVROOT}")
 SET (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM  NEVER)
 SET (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY  ONLY)
diff --git a/port/iOS/build.sh b/port/iOS/build.sh
index 199418e17..7e454fae2 100755
--- a/port/iOS/build.sh
+++ b/port/iOS/build.sh
@@ -12,8 +12,8 @@ BUILD_DIR="./lib/iOS"
 IOS_SDK_VERSION=$(xcodebuild -version -sdk iphoneos | grep SDKVersion | cut -f2 -d ':' | tr -d '[[:space:]]')
 ###################################
 
-BUILD_SHARED_LIBS=ON
-BUILD_TYPE=MinSizeRel
+BUILD_SHARED_LIBS=OFF
+BUILD_TYPE=Release
 
 ################################################
 # 		 Minimum iOS deployment target version
@@ -62,7 +62,7 @@ build_arch()
 
     rm CMakeCache.txt
 
-    cmake  -G 'Unix Makefiles' -DCMAKE_TOOLCHAIN_FILE=./port/iOS/IPHONEOS_$(echo $1 | tr '[:lower:]' '[:upper:]')_TOOLCHAIN.cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DENABLE_BOOST_WORKAROUND=ON -DBUILD_SHARED_LIBS=$BUILD_SHARED_LIBS
+    cmake  -G 'Unix Makefiles' -DCMAKE_TOOLCHAIN_FILE=./port/iOS/IPHONEOS_$(echo $1 | tr '[:lower:]' '[:upper:]')_TOOLCHAIN.cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_SHARED_LIBS=$BUILD_SHARED_LIBS
 
     echo "[!] Building $1 library"