Adjust cmake scripts

kyubotics · Jan 14, 2019 · 92d7622 · 92d7622
1 parent 484bbe6
commit 92d7622
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 14 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,13 +8,8 @@ set(CMAKE_CXX_FLAGS "/MP ${CMAKE_CXX_FLAGS}")  # build with object level paralle
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
 
 include(cotire)
-include(UseStaticCRT)
 include(FindVcpkgIncludeDir)
-
-if(CMAKE_BUILD_TYPE MATCHES "^Debug$")
-    # fix Vcpkg debug library lookup bug, see https://github.com/Microsoft/vcpkg/issues/1626
-    list(APPEND CMAKE_IGNORE_PATH ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib)
-endif()
+include(FixDebugLibraryLookup)
 
 include_directories(${VCPKG_INCLUDE_DIR})
 include_directories(src)
@@ -26,6 +21,8 @@ add_definitions(-DBOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE
 
 find_package(Iconv REQUIRED)
 
+include(FixLinkConflict)
+
 file(GLOB_RECURSE SOURCE_FILES src/*.cpp)
 set(LIB_NAME "com.example.demo")
 add_library(${LIB_NAME} SHARED ${SOURCE_FILES})

diff --git a/cmake/Modules/FixDebugLibraryLookup.cmake b/cmake/Modules/FixDebugLibraryLookup.cmake
@@ -0,0 +1,4 @@
+if(CMAKE_BUILD_TYPE MATCHES "^Debug$")
+    # fix Vcpkg debug library lookup bug, see https://github.com/Microsoft/vcpkg/issues/1626
+    list(APPEND CMAKE_IGNORE_PATH ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib)
+endif()
diff --git a/cmake/Modules/UseStaticCRT.cmake b/cmake/Modules/UseStaticCRT.cmake
diff --git a/cmake/x86-windows-static-custom.cmake b/cmake/x86-windows-static-custom.cmake
@@ -1,4 +1,4 @@
 set(VCPKG_TARGET_ARCHITECTURE x86)
-set(VCPKG_CRT_LINKAGE static)
+set(VCPKG_CRT_LINKAGE dynamic)
 set(VCPKG_LIBRARY_LINKAGE static)
 set(VCPKG_PLATFORM_TOOLSET v141)