summaryrefslogtreecommitdiff
path: root/depends
diff options
context:
space:
mode:
authorTimothy Collett2012-09-10 09:19:21 -0400
committerTimothy Collett2012-09-10 09:19:21 -0400
commit274d6038adce5797b58cee78a330eb5d639bf59e (patch)
treea80b541fe5352594f5e2d82da50f0d38ddbfedfe /depends
parent270351f510db516811117ab746a563560102c14b (diff)
downloaddfhack-274d6038adce5797b58cee78a330eb5d639bf59e.tar.gz
dfhack-274d6038adce5797b58cee78a330eb5d639bf59e.tar.bz2
dfhack-274d6038adce5797b58cee78a330eb5d639bf59e.tar.xz
Merge further changes (???)
Diffstat (limited to 'depends')
-rw-r--r--depends/protobuf/CMakeLists.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/depends/protobuf/CMakeLists.txt b/depends/protobuf/CMakeLists.txt
index 570c77b1..8cd5febc 100644
--- a/depends/protobuf/CMakeLists.txt
+++ b/depends/protobuf/CMakeLists.txt
@@ -7,10 +7,10 @@ IF(CMAKE_COMPILER_IS_GNUCC)
STRING(REGEX MATCHALL "[0-9]+" GCC_VERSION_COMPONENTS ${GCC_VERSION})
LIST(GET GCC_VERSION_COMPONENTS 0 GCC_MAJOR)
LIST(GET GCC_VERSION_COMPONENTS 1 GCC_MINOR)
- IF(GCC_MAJOR LESS 4 OR (GCC_MAJOR EQUAL 4 AND GCC_MINOR LESS 2))
+ #IF(GCC_MAJOR LESS 4 OR (GCC_MAJOR EQUAL 4 AND GCC_MINOR LESS 2))
#GCC is too old
- SET(STL_HASH_OLD_GCC 1)
- ENDIF()
+ # SET(STL_HASH_OLD_GCC 1)
+ #ENDIF()
#SET(CMAKE_CXX_FLAGS "-std=c++0x")
SET(HAVE_HASH_MAP 0)