Fixed some issues with build under Windows and added a test for Windows

jgaa · Mar 9, 2024 · 29fb05f · 29fb05f
1 parent f75dee3
commit 29fb05f
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 6 deletions.
diff --git a/include/logfault/logfault.h b/include/logfault/logfault.h
@@ -143,6 +143,11 @@ Home: https://github.com/jgaa/logfault
 #   endif
 #endif
 
+#ifdef ERROR
+// Thank you SOOO much Microsoft!
+#   undef ERROR
+#endif
+
 
 namespace logfault {
 

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -25,9 +25,9 @@ set_property(TARGET default_to_clog PROPERTY CXX_STANDARD 11)
 
 target_include_directories(default_to_clog
     PRIVATE
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}
-    $<BUILD_INTERFACE:${LOGFAULT_ROOT}/include
-    $<BUILD_INTERFACE:${GTEST_INCLUDE_DIRS}
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${LOGFAULT_ROOT}/include
+    ${GTEST_INCLUDE_DIRS}
     )
 
 target_link_libraries(default_to_clog
@@ -49,9 +49,9 @@ set_property(TARGET default_to_clog_with_tid PROPERTY CXX_STANDARD 11)
 
 target_include_directories(default_to_clog_with_tid
     PRIVATE
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}
-    $<BUILD_INTERFACE:${LOGFAULT_ROOT}/include
-    $<BUILD_INTERFACE:${GTEST_INCLUDE_DIRS}
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${LOGFAULT_ROOT}/include
+    ${GTEST_INCLUDE_DIRS}
     )
 
 target_link_libraries(default_to_clog_with_tid

diff --git a/tests/default_to_clog.cpp b/tests/default_to_clog.cpp
@@ -102,6 +102,22 @@ TEST(Logfault, HelloTid) {
 }
 #endif
 
+#if defined(WIN32) && defined(LOGFAULT_USE_TID_AS_NAME)
+TEST(Logfault, HelloTid) {
+
+    string output;
+    {
+        ClogRedirector redir{ output };
+        LFLOG_INFO << "Test log";
+    }
+
+    regex pattern{ R"(.* INFO [0-9]{1,10} Test log.*)" };
+    EXPECT_TRUE(regex_search(output, pattern));
+    cout << "Output: " << output << endl;
+}
+#endif
+
+
 int main(int argc, char **argv) {
     ::testing::InitGoogleTest(&argc, argv);