1
0
Эх сурвалжийг харах

cmake: Make static VC runtime libraries consistent

Makes Visual C runtime libraries consistent across
Debug/MinSizeRel/Release/RelWithDebInfo, rather than just changing those
flags for RelWithDebInfo.  Also adds /Zl for statically linked
libraries.

Closes obsproject/obs-studio#1421
jp9000 7 жил өмнө
parent
commit
b3ef46d986

+ 1 - 1
UI/win-update/updater/CMakeLists.txt

@@ -32,7 +32,7 @@ set(updater_SOURCES
 
 add_definitions(-DNOMINMAX -DUNICODE -D_UNICODE)
 if(MSVC)
-	add_compile_options("$<$<CONFIG:RelWithDebInfo>:/MT>")
+	add_compile_options($<IF:$<CONFIG:Debug>,/MTd,/MT>)
 endif()
 
 add_executable(updater WIN32

+ 1 - 1
deps/blake2/CMakeLists.txt

@@ -13,7 +13,7 @@ include_directories(
 
 if(WIN32)
 	if(MSVC)
-		add_compile_options("$<$<CONFIG:RelWithDebInfo>:/MT>")
+		add_compile_options($<IF:$<CONFIG:Debug>,/MTd,/MT> /Zl)
 	endif()
 	add_definitions(
 		-Dinline=_inline

+ 1 - 1
deps/ipc-util/CMakeLists.txt

@@ -23,7 +23,7 @@ else()
 endif()
 
 if(MSVC)
-	add_compile_options("$<$<CONFIG:RelWithDebInfo>:/MT>")
+	add_compile_options($<IF:$<CONFIG:Debug>,/MTd,/MT> /Zl)
 endif()
 
 add_library(ipc-util STATIC

+ 1 - 1
deps/lzma/CMakeLists.txt

@@ -30,7 +30,7 @@ add_definitions(
 
 if(WIN32)
 	if(MSVC)
-		add_compile_options("$<$<CONFIG:RelWithDebInfo>:/MT>")
+		add_compile_options($<IF:$<CONFIG:Debug>,/MTd,/MT> /Zl)
 		add_compile_options("/wd4244")
 		add_compile_options("/wd4267")
 	endif()

+ 1 - 1
plugins/win-capture/get-graphics-offsets/CMakeLists.txt

@@ -12,7 +12,7 @@ set(get-graphics-offsets_SOURCES
 	d3d9-offsets.cpp)
 
 if(MSVC)
-	add_compile_options("$<$<CONFIG:RelWithDebInfo>:/MT>")
+	add_compile_options($<IF:$<CONFIG:Debug>,/MTd,/MT>)
 endif()
 
 add_executable(get-graphics-offsets

+ 1 - 1
plugins/win-capture/graphics-hook/CMakeLists.txt

@@ -30,7 +30,7 @@ set(graphics-hook_SOURCES
 	d3d12-capture.cpp)
 
 if(MSVC)
-	add_compile_options("$<$<CONFIG:RelWithDebInfo>:/MT>")
+	add_compile_options("$<IF:$<CONFIG:Debug>,/MTd,/MT>")
 endif()
 
 add_library(graphics-hook MODULE

+ 1 - 1
plugins/win-capture/inject-helper/CMakeLists.txt

@@ -10,7 +10,7 @@ set(inject-helper_SOURCES
 	inject-helper.c)
 
 if(MSVC)
-	add_compile_options("$<$<CONFIG:RelWithDebInfo>:/MT>")
+	add_compile_options($<IF:$<CONFIG:Debug>,/MTd,/MT>)
 endif()
 
 add_executable(inject-helper

+ 1 - 1
plugins/win-ivcam/seg_service/CMakeLists.txt

@@ -33,7 +33,7 @@ set(seg_service_SOURCES
 	)
 
 if(MSVC)
-	add_compile_options("$<$<CONFIG:RelWithDebInfo>:/MT>")
+	add_compile_options($<IF:$<CONFIG:Debug>,/MTd,/MT>)
 endif()
 
 add_executable(seg_service WIN32