diff options
| author | don bright <hugh.m.bright@gmail.com> | 2013-02-24 03:54:53 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2013-02-24 03:54:53 (GMT) |
| commit | ca41979ee514f642c506e4f4d81461f19b587bf2 (patch) | |
| tree | f31feb004d0b724d5240c8a227c7f0c886939a1b /tests | |
| parent | eff16283358217b43b310269a72e0cb47357a8b3 (diff) | |
| parent | abc9da96c89b337377ee62ac29ee54e4e7b0a514 (diff) | |
Merge branch 'master' of github.com:openscad/openscad into issue11_2
Conflicts:
RELEASE_NOTES
openscad.pro
src/mainwin.cc
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/CMakeLists.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index e62fbfd..733a87a 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -101,7 +101,6 @@ if(CMAKE_CXX_COMPILER MATCHES ".*clang.*") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-function") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-c++11-extensions") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-sign-compare") - string(REPLACE -frounding-math "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) endif() # @@ -372,6 +371,10 @@ if("${CGAL_MAJOR_VERSION}.${CGAL_MINOR_VERSION}" VERSION_LESS 3.6) endif() inclusion(CGAL_DIR CGAL_INCLUDE_DIRS) +if(CMAKE_CXX_COMPILER MATCHES ".*clang.*") + string(REPLACE "-frounding-math" "" CGAL_CXX_FLAGS_INIT ${CGAL_CXX_FLAGS_INIT}) +endif() + # Imagemagick if (SKIP_IMAGEMAGICK) |