zorba-coders team mailing list archive

[Dennis Knochenwefel <dennis.knochenwefel@xxxxxxxxxx>]

Dennis Knochenwefel has proposed merging lp:~zorba-coders/zorba/bug-1021362 into lp:zorba.

Requested reviews:
  Dennis Knochenwefel (dennis-knochenwefel)
Related bugs:
  Bug #1021362 in Zorba: "windows build broken using (VS2010 / cmake 2.8.8)"
  https://bugs.launchpad.net/zorba/+bug/1021362

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1021362/+merge/113604

fix for bug #1021362
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1021362/+merge/113604
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-06-28 15:05:15 +0000
+++ CMakeLists.txt	2012-07-05 15:59:24 +0000
@@ -137,14 +137,24 @@
 SET(CMAKE_EXTRA_INCLUDE_FILES)
 
 # C++11 langauge features
-CHECK_CXX_SOURCE_COMPILES("int main() { int *p = nullptr; }" ZORBA_CXX_NULLPTR)
-CHECK_CXX_SOURCE_COMPILES("int main() { static_assert(1,\"\"); }" ZORBA_CXX_STATIC_ASSERT)
+CHECK_CXX_SOURCE_COMPILES(
+  "int main() { int *p = nullptr; }" ZORBA_CXX_NULLPTR)
+CHECK_CXX_SOURCE_COMPILES(
+  "int main() { static_assert(1,\"\"); }" ZORBA_CXX_STATIC_ASSERT)
 
 # C++11 standard library types
-CHECK_CXX_SOURCE_COMPILES ("#include <type_traits>\nint main() { std::enable_if<true,int> x; }" ZORBA_HAVE_ENABLE_IF)
-CHECK_CXX_SOURCE_COMPILES ("#include <memory>\nint main() { std::unique_ptr<int> p; }" ZORBA_HAVE_UNIQUE_PTR)
-CHECK_CXX_SOURCE_COMPILES ("#include <unordered_map>\nint main() { std::unordered_map<int,int> m; }" ZORBA_HAVE_UNORDERED_MAP)
-CHECK_CXX_SOURCE_COMPILES ("#include <unordered_set>\nint main() { std::unordered_set<int> s; }" ZORBA_HAVE_UNORDERED_SET)
+CHECK_CXX_SOURCE_COMPILES (
+  "#include <type_traits>
+  int main() { std::enable_if<true,int> x; }" ZORBA_HAVE_ENABLE_IF)
+CHECK_CXX_SOURCE_COMPILES ("
+  #include <memory>
+  int main() { std::unique_ptr<int> p; }" ZORBA_HAVE_UNIQUE_PTR)
+CHECK_CXX_SOURCE_COMPILES (
+  "#include <unordered_map>
+  int main() { std::unordered_map<int,int> m; }" ZORBA_HAVE_UNORDERED_MAP)
+CHECK_CXX_SOURCE_COMPILES (
+  "#include <unordered_set>
+  int main() { std::unordered_set<int> s; }" ZORBA_HAVE_UNORDERED_SET)
 
 ################################################################################
 # Various cmake macros