From 0774d2de8d34b535e9d462ffca1e7dbe2a73abf5 Mon Sep 17 00:00:00 2001
From: Adam <classygopher@gmail.com>
Date: Sun, 9 Jul 2023 03:15:43 +0100
Subject: [PATCH] cmake: differentiate msvc and win32 link steps

---
 CMakeLists.txt | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index af46a7a..458668c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,19 +32,20 @@ target_link_directories(bolt PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
 set_target_properties(bolt PROPERTIES CXX_STANDARD 20 CXX_EXTENSIONS OFF)
 target_link_libraries(bolt PUBLIC libcef_dll_wrapper)
 target_link_libraries(bolt PUBLIC "fmt")
-if(MSVC)
-    # Specify to MSVC that our link targets are static (.lib)
-    target_compile_options(bolt PUBLIC $<$<CONFIG:>:/MT> $<$<CONFIG:Debug>:/MTd> $<$<CONFIG:Release>:/MT>)
-endif()
 if(UNIX AND NOT APPLE)
     set_target_properties(bolt PROPERTIES INSTALL_RPATH "$ORIGIN")
     target_link_libraries(bolt PUBLIC "${CEF_ROOT}/${CMAKE_BUILD_TYPE}/libcef.so")
     target_link_libraries(bolt PUBLIC "X11")
-elseif(WIN32)
-    # note parentheses instead of brackets - this variable is for substitution by Visual Studio, not cmake
+elseif(MSVC)
+    target_compile_options(bolt PUBLIC $<$<CONFIG:>:/MT> $<$<CONFIG:Debug>:/MTd> $<$<CONFIG:Release>:/MT>)
+    set_target_properties(bolt PROPERTIES WIN32_EXECUTABLE TRUE)
+    # note parentheses instead of brackets below - this variable is for substitution by Visual Studio, not cmake
     target_link_libraries(bolt PUBLIC "${CEF_ROOT}/$(ConfigurationName)/libcef.lib")
     target_link_libraries(bolt PUBLIC "${CEF_ROOT}/$(ConfigurationName)/cef_sandbox.lib")
+elseif(WIN32)
     set_target_properties(bolt PROPERTIES WIN32_EXECUTABLE TRUE)
+    target_link_libraries(bolt PUBLIC "${CEF_ROOT}/${CMAKE_BUILD_TYPE}/libcef.lib")
+    target_link_libraries(bolt PUBLIC "${CEF_ROOT}/${CMAKE_BUILD_TYPE}/cef_sandbox.lib")
 elseif(APPLE)
     # TODO: mac support
 endif()