fix builds macos and ios after integrating windows ci modifications

cansulting · Apr 17, 2018 · 4a2924e · 4a2924e
1 parent 722caac
commit 4a2924e
Show file tree

Hide file tree

Showing 44 changed files with 21 additions and 10,186 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -4,3 +4,9 @@
 [submodule "toolchains/polly"]
 	path = toolchains/polly
 	url = [email protected]:ruslo/polly.git
+[submodule "tools/gyp"]
+	path = tools/gyp
+	url = [email protected]:bnoordhuis/gyp.git
+[submodule "core/lib/spdlog"]
+    path = core/lib/spdlog
+    url = [email protected]:gabime/spdlog.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -19,6 +19,11 @@ list(APPEND INCLUDE_DIRECTORIES core/test/include/)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
 set(CMAKE_MACOSX_RPATH 1)
 
+string(FIND "${CMAKE_OSX_SYSROOT}" "iphone" IS_IOS)
+if(IS_IOS GREATER_EQUAL 0)
+    set(BUILD_TESTING OFF CACHE BOOL "iOS build fail otherwise" FORCE)
+endif()
+
 add_subdirectory(doc)
 add_subdirectory(core)
 add_subdirectory(qt-host)

diff --git a/appveyor.yml b/appveyor.yml
@@ -2,7 +2,7 @@ version: 1.0.{build}
 branches:
   only:
   - ci-integration
-  - ci-win-integration
+  - windows-ci
 image:
 - Visual Studio 2015
 configuration:

diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
@@ -2,7 +2,7 @@ add_subdirectory(lib)
 add_subdirectory(src)
 
 string(FIND "${CMAKE_OSX_SYSROOT}" "iphone" IS_IOS)
-if (IS_IOS LESS 0)
+if(IS_IOS LESS 0)
     enable_testing()
     add_subdirectory(test)
-endif ()
+endif()
diff --git a/core/lib/CMakeLists.txt b/core/lib/CMakeLists.txt
@@ -11,10 +11,10 @@ add_subdirectory(sqlite3)
 add_subdirectory(openssl)
 add_subdirectory(snappy)
 add_subdirectory(leveldb)
+
 add_subdirectory(spdlog)
 
 # SOCI configuration
-
 set(SOCI_STATIC ON)
 set(SOCI_SHARED OFF)
 

diff --git a/core/lib/spdlog/.gitignore b/core/lib/spdlog/.gitignore
diff --git a/core/lib/spdlog/.travis.yml b/core/lib/spdlog/.travis.yml
diff --git a/core/lib/spdlog/include/spdlog/async_logger.h b/core/lib/spdlog/include/spdlog/async_logger.h