Improved build system organization

themarpe · themarpe · commit 22ad34c8264f · 2020-12-08T19:44:36.000+01:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,9 +1,9 @@
 cmake_minimum_required(VERSION 3.2) # For Hunter
 
-# Set compile with -fPIC (on all targets)
-set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-
 # Set defaults
+# PIC toolchain as we are building an shared library
+set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_LIST_DIR}/cmake/toolchain/pic.cmake" CACHE STRING "")
+# Build dependencies as 'Release' only by default
 set(HUNTER_CONFIGURATION_TYPES "Release" CACHE STRING "Hunter dependencies list of build configurations")
 
 include("cmake/HunterGate.cmake")
diff --git a/ci/msvc_toolchain.cmake b/ci/msvc_toolchain.cmake
diff --git a/cmake/ToolchainConfig.cmake b/cmake/ToolchainConfig.cmake
diff --git a/cmake/toolchain/msvc.cmake b/cmake/toolchain/msvc.cmake
@@ -0,0 +1,5 @@
+# Set PIC
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+
+# Statically compile vcruntime library
+add_compile_options(/MT)
diff --git a/cmake/toolchain/pic.cmake b/cmake/toolchain/pic.cmake
@@ -0,0 +1,2 @@
+# Simple toolchain which enables PIC for all dependencies
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
diff --git a/depthai-core b/depthai-core
@@ -1 +1 @@
-Subproject commit 778822b97aa51522fe2ee52ed60abafca9542b3b
+Subproject commit a5afb0e18bf5ff1128e8ce03daa62277f2bb4269
diff --git a/setup.py b/setup.py
@@ -110,7 +110,7 @@ def build_extension(self, ext):
 
         if platform.system() == "Windows":
             cmake_args += ['-DCMAKE_LIBRARY_OUTPUT_DIRECTORY_{}={}'.format(cfg.upper(), extdir)]
-            cmake_args += ['-DCMAKE_TOOLCHAIN_FILE={}'.format(os.path.dirname(os.path.abspath(__file__)) + '/ci/msvc_toolchain.cmake')]
+            cmake_args += ['-DCMAKE_TOOLCHAIN_FILE={}'.format(os.path.dirname(os.path.abspath(__file__)) + '/cmake/toolchain/msvc.cmake')]
             
             # Detect whether 32 / 64 bit Python is used and compile accordingly
             if sys.maxsize > 2**32:

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# Simple toolchain which enables PIC for all dependencies`
	`2`	`+set(CMAKE_POSITION_INDEPENDENT_CODE ON)`