1
=== modified file 'CMakeLists.txt'
2
--- CMakeLists.txt	2012-06-28 15:05:15 +0000
3
+++ CMakeLists.txt	2012-07-05 15:59:24 +0000
4
@@ -137,14 +137,24 @@
5
137
SET(CMAKE_EXTRA_INCLUDE_FILES)
137
SET(CMAKE_EXTRA_INCLUDE_FILES)
6
138
138
7
139
# C++11 langauge features
139
# C++11 langauge features
10
140
CHECK_CXX_SOURCE_COMPILES("int main() { int *p = nullptr; }" ZORBA_CXX_NULLPTR)
140
CHECK_CXX_SOURCE_COMPILES(
11
141
CHECK_CXX_SOURCE_COMPILES("int main() { static_assert(1,\"\"); }" ZORBA_CXX_STATIC_ASSERT)
141
  "int main() { int *p = nullptr; }" ZORBA_CXX_NULLPTR)
12
142
CHECK_CXX_SOURCE_COMPILES(
13
143
  "int main() { static_assert(1,\"\"); }" ZORBA_CXX_STATIC_ASSERT)
14
142
144
15
143
# C++11 standard library types
145
# C++11 standard library types
20
144
CHECK_CXX_SOURCE_COMPILES ("#include <type_traits>\nint main() { std::enable_if<true,int> x; }" ZORBA_HAVE_ENABLE_IF)
146
CHECK_CXX_SOURCE_COMPILES (
21
145
CHECK_CXX_SOURCE_COMPILES ("#include <memory>\nint main() { std::unique_ptr<int> p; }" ZORBA_HAVE_UNIQUE_PTR)
147
  "#include <type_traits>
22
146
CHECK_CXX_SOURCE_COMPILES ("#include <unordered_map>\nint main() { std::unordered_map<int,int> m; }" ZORBA_HAVE_UNORDERED_MAP)
148
  int main() { std::enable_if<true,int> x; }" ZORBA_HAVE_ENABLE_IF)
23
147
CHECK_CXX_SOURCE_COMPILES ("#include <unordered_set>\nint main() { std::unordered_set<int> s; }" ZORBA_HAVE_UNORDERED_SET)
149
CHECK_CXX_SOURCE_COMPILES ("
24
150
  #include <memory>
25
151
  int main() { std::unique_ptr<int> p; }" ZORBA_HAVE_UNIQUE_PTR)
26
152
CHECK_CXX_SOURCE_COMPILES (
27
153
  "#include <unordered_map>
28
154
  int main() { std::unordered_map<int,int> m; }" ZORBA_HAVE_UNORDERED_MAP)
29
155
CHECK_CXX_SOURCE_COMPILES (
30
156
  "#include <unordered_set>
31
157
  int main() { std::unordered_set<int> s; }" ZORBA_HAVE_UNORDERED_SET)
32
148
158
33
149
################################################################################
159
################################################################################
34
150
# Various cmake macros
160
# Various cmake macros
Reviewer	Date Requested	Status
Paul J. Lucas	2012-07-05	Approve on 2012-07-05
Dennis Knochenwefel		Approve on 2012-07-05
Review via email: mp+113604@code.launchpad.net