aboutsummaryrefslogtreecommitdiff
path: root/src/server/proto
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2016-04-05 17:55:32 +0200
committerShauren <shauren.trinity@gmail.com>2016-04-05 22:43:41 +0200
commit4a3a178d7fe9d2d7e8fde2fe915cf5cec5223502 (patch)
tree4d75c3393ff1707ec5a2793590f2496be8373a22 /src/server/proto
parent792299bbd544a44911e463383be567d7738412a5 (diff)
Buildsystem: Initial changes to support building with vs clang toolset
Diffstat (limited to 'src/server/proto')
-rw-r--r--src/server/proto/CMakeLists.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/server/proto/CMakeLists.txt b/src/server/proto/CMakeLists.txt
index fd20378084f..20235735b17 100644
--- a/src/server/proto/CMakeLists.txt
+++ b/src/server/proto/CMakeLists.txt
@@ -8,7 +8,9 @@
# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-if (MSVC)
+if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+ string(REGEX REPLACE "/W[0-4] " "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+ string(REGEX REPLACE "/W[0-4] " "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
add_definitions(/W0)
else()
add_definitions(-w)
@@ -30,8 +32,8 @@ GroupSources(${CMAKE_CURRENT_SOURCE_DIR})
add_definitions(-DTRINITY_API_EXPORT_SHARED)
add_library(proto STATIC
- ${PRIVATE_SOURCES}
${PRIVATE_PCH_SOURCE}
+ ${PRIVATE_SOURCES}
)
CollectIncludeDirectories(