summaryrefslogtreecommitdiff
path: root/depends
diff options
context:
space:
mode:
authorTimothy Collett2012-05-24 15:39:11 -0400
committerTimothy Collett2012-05-24 15:39:11 -0400
commit44c3afc3066652f39d0b7be56cdca1f88e155132 (patch)
treeb2b7c1d778527f3b2a99f8c5301170c86e636009 /depends
parent7e88631698077ef88dced138126dd9f36acc6388 (diff)
parentae41ddc04a2b3a076bd18af984f163e46c74b65f (diff)
downloaddfhack-44c3afc3066652f39d0b7be56cdca1f88e155132.tar.gz
dfhack-44c3afc3066652f39d0b7be56cdca1f88e155132.tar.bz2
dfhack-44c3afc3066652f39d0b7be56cdca1f88e155132.tar.xz
Merge git://github.com/quietust/dfhack
Gotta get the changes that prevent DFHack from crashing.
Diffstat (limited to 'depends')
-rw-r--r--depends/protobuf/CMakeLists.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/depends/protobuf/CMakeLists.txt b/depends/protobuf/CMakeLists.txt
index dddefb06..570c77b1 100644
--- a/depends/protobuf/CMakeLists.txt
+++ b/depends/protobuf/CMakeLists.txt
@@ -200,7 +200,9 @@ google/protobuf/compiler/zip_writer.cc
LIST(APPEND LIBPROTOBUF_FULL_SRCS ${LIBPROTOBUF_LITE_SRCS})
-SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -Wno-sign-compare")
+IF(CMAKE_COMPILER_IS_GNUCC)
+ SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -Wno-sign-compare")
+ENDIF()
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
SET(PROTOBUF_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR})