Fixed compiler flags

SChernykh · Feb 13, 2024 · 3bf5391 · 3bf5391
1 parent 3d9a811
commit 3bf5391
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 23 deletions.
diff --git a/cmake/flags.cmake b/cmake/flags.cmake
@@ -1,7 +1,3 @@
-if (ARCH_ID MATCHES "^(aarch64|arm64|armv8-a)$")
-	set(ARMv8 1)
-endif()
-
 if (CMAKE_CXX_COMPILER_ID MATCHES GNU)
 	set(GENERAL_FLAGS "-pthread")
 

diff --git a/cmake/grpc.cmake b/cmake/grpc.cmake
@@ -24,18 +24,6 @@ set(CARES_SHARED OFF CACHE BOOL "Build as a shared library")
 set(CARES_INSTALL OFF CACHE BOOL "Create installation targets (chain builders may want to disable this)")
 set(CARES_BUILD_TOOLS OFF CACHE BOOL "Build tools")
 
-if (CMAKE_CXX_COMPILER_ID MATCHES MSVC)
-	set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /W0 /Zi /Od /Ob0 /MP /MTd")
-	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /W0 /Zi /Od /Ob0 /MP /MTd")
-	set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /W0 /O1 /Ob2 /Oi /Os /Oy /MP /MT /GL")
-	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /W0 /O1 /Ob2 /Oi /Os /Oy /MP /MT /GL")
-	set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} /W0 /Ob1 /Ot /Zi /MP /MT")
-	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /W0 /Ob1 /Ot /Zi /MP /MT")
-else()
-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Os -w")
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Os -w")
-endif()
-
 if ((CMAKE_C_COMPILER_ID MATCHES MSVC) OR (CMAKE_CXX_COMPILER_ID MATCHES MSVC))
 	include_directories(external/src/common)
 endif()

diff --git a/cmake/standard.cmake b/cmake/standard.cmake
@@ -11,3 +11,7 @@ if(NOT ARCH_ID)
   endif()
   string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" ARCH_ID)
 endif()
+
+if (ARCH_ID MATCHES "^(aarch64|arm64|armv8-a)$")
+	set(ARMv8 1)
+endif()
diff --git a/external/src/Tari/proto.h b/external/src/Tari/proto.h
@@ -2,7 +2,7 @@
 
 #ifdef _MSC_VER
 #pragma warning(push, 0)
-#elif __GNUC__
+#elif defined __GNUC__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wundef"
 #endif
@@ -29,6 +29,6 @@
 
 #ifdef _MSC_VER
 #pragma warning(pop)
-#elif __GNUC__
+#elif defined __GNUC__
 #pragma GCC diagnostic pop
 #endif
diff --git a/external/src/grpc b/external/src/grpc
diff --git a/tests/cmake/flags.cmake b/tests/cmake/flags.cmake
@@ -1,7 +1,3 @@
-if (ARCH_ID MATCHES "^(aarch64|arm64|armv8-a)$")
-	set(ARMv8 1)
-endif()
-
 if (CMAKE_CXX_COMPILER_ID MATCHES GNU)
 	set(GENERAL_FLAGS "-pthread")
 	set(WARNING_FLAGS "-Wall -Wextra")

diff --git a/tests/cmake/standard.cmake b/tests/cmake/standard.cmake
@@ -11,3 +11,7 @@ if(NOT ARCH_ID)
   endif()
   string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" ARCH_ID)
 endif()
+
+if (ARCH_ID MATCHES "^(aarch64|arm64|armv8-a)$")
+	set(ARMv8 1)
+endif()