Browse Source

Fix warnings about redefined CURL_STATICLIB.
Fix warnings about unrecognized compiler flags when building with clang on linux.

Rokas Kupstys 8 years ago
parent
commit
3850f10ac3
2 changed files with 7 additions and 3 deletions
  1. 7 2
      Build/CMake/Modules/AtomicLinux.cmake
  2. 0 1
      Source/Atomic/Web/WebInternalConfig.h

+ 7 - 2
Build/CMake/Modules/AtomicLinux.cmake

@@ -3,8 +3,13 @@ set(ATOMIC_NODE_JAKE Build/Linux/node/node Build/node_modules/jake/bin/cli.js -f
 
 include(AtomicDesktop)
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-warn-absolute-paths -fPIC")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-warn-absolute-paths -Wno-invalid-offsetof -std=gnu++0x -fPIC")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-invalid-offsetof -std=gnu++0x -fPIC")
+
+if( CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX )
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-warn-absolute-paths")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-warn-absolute-paths")
+endif()
 
 find_package(PkgConfig REQUIRED)
 # for native file dialog

+ 0 - 1
Source/Atomic/Web/WebInternalConfig.h

@@ -33,4 +33,3 @@
 #define ASIO_STANDALONE
 #define ASIO_HAS_STD_ARRAY
 #define ASIO_HAS_CSTDINT
-#define CURL_STATICLIB