fix: add preprocessor macro to MSVC

qubka · qubka · commit a4da877195c1 · 2025-09-27T14:15:30.000+01:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -65,7 +65,7 @@ endif()
 target_link_libraries(${PROJECT_NAME} PRIVATE ${CPPLM_LINK_LIBRARIES})
 
 if(MSVC)
-    target_compile_options(${PROJECT_NAME} PRIVATE /W4 /WX)
+    target_compile_options(${PROJECT_NAME} PRIVATE /W4 /WX /Zc:preprocessor)
 else()
     target_compile_options(${PROJECT_NAME} PRIVATE -Wextra -Wshadow -Wconversion -Wpedantic -Werror)
 endif()
diff --git a/external/plugify b/external/plugify
@@ -1 +1 @@
-Subproject commit 38d6e9f5452fee901586219974cd7b177847d7bf
+Subproject commit 7b231e630874c85795efb15edf3e345e19e889fa
diff --git a/test/cross_call_master/CMakeLists.txt b/test/cross_call_master/CMakeLists.txt
@@ -36,7 +36,7 @@ add_library(${PROJECT_NAME} SHARED ${PLUGIN_SOURCES})
 target_include_directories(${PROJECT_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/external/plugify/include")
 
 if(MSVC)
-    target_compile_options(${PROJECT_NAME} PRIVATE /W4 /WX)
+    target_compile_options(${PROJECT_NAME} PRIVATE /W4 /WX /Zc:preprocessor)
 else()
     target_compile_options(${PROJECT_NAME} PRIVATE -Wextra -Wshadow -Wconversion -Wpedantic -Werror)
 endif()
diff --git a/test/cross_call_master/external/plugify/include/plg/config.hpp b/test/cross_call_master/external/plugify/include/plg/config.hpp
@@ -43,7 +43,7 @@ namespace plg {
 		}
 	}
 } // namespace plg
-#  define PLUGIFY_THROW(str, exp, ...) ::plg::throw_exception<exp>(str, ##__VA_ARGS__);
+#  define PLUGIFY_THROW(str, exp, ...) ::plg::throw_exception<exp>(str __VA_OPT__(,) __VA_ARGS__);
 #else
 #  include <cstdlib>
 #  include <cstdio>
diff --git a/test/cross_call_worker/CMakeLists.txt b/test/cross_call_worker/CMakeLists.txt
@@ -36,7 +36,7 @@ add_library(${PROJECT_NAME} SHARED ${PLUGIN_SOURCES})
 target_include_directories(${PROJECT_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/external/plugify/include")
 
 if(MSVC)
-    target_compile_options(${PROJECT_NAME} PRIVATE /W4 /WX)
+    target_compile_options(${PROJECT_NAME} PRIVATE /W4 /WX /Zc:preprocessor)
 else()
     target_compile_options(${PROJECT_NAME} PRIVATE -Wextra -Wshadow -Wconversion -Wpedantic -Werror)
 endif()
diff --git a/test/cross_call_worker/external/plugify/include/plg/config.hpp b/test/cross_call_worker/external/plugify/include/plg/config.hpp
@@ -43,7 +43,7 @@ namespace plg {
 		}
 	}
 } // namespace plg
-#  define PLUGIFY_THROW(str, exp, ...) ::plg::throw_exception<exp>(str, ##__VA_ARGS__);
+#  define PLUGIFY_THROW(str, exp, ...) ::plg::throw_exception<exp>(str __VA_OPT__(,) __VA_ARGS__);
 #else
 #  include <cstdlib>
 #  include <cstdio>
diff --git a/test/example_plugin/CMakeLists.txt b/test/example_plugin/CMakeLists.txt
@@ -36,7 +36,7 @@ add_library(${PROJECT_NAME} SHARED ${PLUGIN_SOURCES})
 target_include_directories(${PROJECT_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/external/plugify/include")
 
 if(MSVC)
-    target_compile_options(${PROJECT_NAME} PRIVATE /W4 /WX)
+    target_compile_options(${PROJECT_NAME} PRIVATE /W4 /WX /Zc:preprocessor)
 else()
     target_compile_options(${PROJECT_NAME} PRIVATE -Wextra -Wshadow -Wconversion -Wpedantic -Werror)
 endif()
diff --git a/test/example_plugin/external/plugify/include/plg/config.hpp b/test/example_plugin/external/plugify/include/plg/config.hpp
@@ -43,7 +43,7 @@ namespace plg {
 		}
 	}
 } // namespace plg
-#  define PLUGIFY_THROW(str, exp, ...) ::plg::throw_exception<exp>(str, ##__VA_ARGS__);
+#  define PLUGIFY_THROW(str, exp, ...) ::plg::throw_exception<exp>(str __VA_OPT__(,) __VA_ARGS__);
 #else
 #  include <cstdlib>
 #  include <cstdio>

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ namespace plg {`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`	`} // namespace plg`
`46`		`-# define PLUGIFY_THROW(str, exp, ...) ::plg::throw_exception<exp>(str, ##__VA_ARGS__);`
	`46`	`+# define PLUGIFY_THROW(str, exp, ...) ::plg::throw_exception<exp>(str __VA_OPT__(,) __VA_ARGS__);`
`47`	`47`	`#else`
`48`	`48`	`# include <cstdlib>`
`49`	`49`	`# include <cstdio>`