Macro fix for newer compiler on Linux (#10)

* Macro fix for newer compiler on Linux * clang-tidy warnings on macOS
PerMalmberg · Aug 22, 2024 · 6fe70b3 · 6fe70b3
1 parent b02663c
commit 6fe70b3
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 4 deletions.
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -27,8 +27,8 @@
 				"build-type-release"
 			],
 			"condition": {
-				"type": "equals",
 				"lhs": "${hostSystemName}",
+				"type": "equals",
 				"rhs": "Linux"
 			},
 			"cacheVariables": {
@@ -58,6 +58,25 @@
 				}
 			}
 		},
+		{
+			"name": "x86-linux-static-dev",
+			"inherits": [
+				"base-default",
+				"base-linux",
+				"base-dev",
+				"build-type-debug"
+			],
+			"condition": {
+				"type": "equals",
+				"lhs": "${hostSystemName}",
+				"rhs": "Linux"
+			},
+			"cacheVariables": {
+				"VCPKG_TARGET_TRIPLET": "x86-linux-static",
+				"CMAKE_CXX_FLAGS": "-m32",
+				"CMAKE_C_FLAGS": "-m32"
+			}
+		},
 		{
 			"name": "osx-static",
 			"inherits": [

diff --git a/src/LoutLogger.cpp b/src/LoutLogger.cpp
@@ -8,7 +8,6 @@
 #include "Lout.h"
 #include "item/ILogItem.h"
 #include "item/StringItem.h"
-#include <climits>
 #include <cstdint>
 #include <ctime>
 #include <limits>
@@ -132,7 +131,7 @@ namespace lout
 //
 //
 //////////////////////////////////////////////////////////////////////////
-#if ULONG_MAX == (0xFFFFFFFFUL) || __APPLE__
+#if !__x86_64__ || __APPLE__
 	// Don't compile this on 64 bit platforms since it is the same as uint64_t
 	LoutLogger& LoutLogger::operator<<(unsigned long value)
 	{

diff --git a/src/LoutLogger.h b/src/LoutLogger.h
@@ -53,7 +53,7 @@ namespace lout
 
 		LoutLogger& operator<<(uint64_t value);
 
-#if ULONG_MAX == (0xFFFFFFFFUL) || __APPLE__
+#if !__x86_64__ || __APPLE__
 		// Don't compile this on 64 bit platforms since it is the same as uint64_t
 		LoutLogger& operator<<(unsigned long value);
 #endif

diff --git a/src/output/IOutput.cpp b/src/output/IOutput.cpp
@@ -7,6 +7,7 @@
 #include "loglevel/ILogLevel.h"
 #include "output/IOutput.h"
 #include <string>
+#include <ostream>
 
 namespace lout::output
 {

diff --git a/vcpkg_triplets/x64-linux-static.cmake b/vcpkg_triplets/x64-linux-static.cmake
@@ -0,0 +1,5 @@
+set(VCPKG_TARGET_ARCHITECTURE x64)
+set(VCPKG_CRT_LINKAGE static)
+set(VCPKG_LIBRARY_LINKAGE static)
+
+set(VCPKG_CMAKE_SYSTEM_NAME Linux)
diff --git a/vcpkg_triplets/x86-linux-static.cmake b/vcpkg_triplets/x86-linux-static.cmake
@@ -0,0 +1,6 @@
+set(VCPKG_TARGET_ARCHITECTURE x86)
+set(VCPKG_CRT_LINKAGE static)
+set(VCPKG_LIBRARY_LINKAGE static)
+
+set(VCPKG_CMAKE_SYSTEM_NAME Linux)
+