enh(Foundation): Windows Eventviewer not able to find PocoFoundation …

…DLL #3304
pocoproject · Feb 10, 2025 · f23e2eb · f23e2eb
1 parent ff26c8e
commit f23e2eb
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/Foundation/CMakeLists.txt b/Foundation/CMakeLists.txt
@@ -105,6 +105,8 @@ else()
 	target_compile_definitions(Foundation PUBLIC UTF8PROC_STATIC)
 endif(POCO_UNBUNDLED)
 
+target_compile_definitions(Foundation PUBLIC POCO_CMAKE)
+
 target_include_directories(Foundation
 	PUBLIC
 		$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>

diff --git a/Foundation/src/EventLogChannel.cpp b/Foundation/src/EventLogChannel.cpp
@@ -196,13 +196,13 @@ void EventLogChannel::setUpRegistry() const
 		std::wstring path;
 		#if defined(POCO_DLL)
 			#if defined(_DEBUG)
-				#if defined(_WIN64)
+				#if defined(_WIN64) && !defined(POCO_CMAKE)
 					path = findLibrary(L"PocoFoundation64d.dll");
 				#else
 					path = findLibrary(L"PocoFoundationd.dll");
 				#endif
 			#else
-				#if defined(_WIN64)
+				#if defined(_WIN64) && !defined(POCO_CMAKE)
 					path = findLibrary(L"PocoFoundation64.dll");
 				#else
 					path = findLibrary(L"PocoFoundation.dll");

diff --git a/cmake/PocoMacros.cmake b/cmake/PocoMacros.cmake
@@ -188,8 +188,10 @@ macro(POCO_MESSAGES out name)
 			POCO_HEADERS( ${out} ${name} ${CMAKE_CURRENT_BINARY_DIR}/${hdr})
 
 			# Add the generated .rc 
-			source_group("${name}\\Resource Files" FILES ${CMAKE_CURRENT_BINARY_DIR}/${rc})
-			list(APPEND ${out} ${CMAKE_CURRENT_BINARY_DIR}/${rc})
+			if(BUILD_SHARED_LIBS)
+				source_group("${name}\\Resource Files" FILES ${CMAKE_CURRENT_BINARY_DIR}/${rc})
+				list(APPEND ${out} ${CMAKE_CURRENT_BINARY_DIR}/${rc})
+			endif()
 		endforeach()
 
 		set_source_files_properties(${ARGN} PROPERTIES HEADER_FILE_ONLY TRUE)