diff options
author | Marius Kintel <marius@kintel.net> | 2013-04-18 22:42:51 (GMT) |
---|---|---|
committer | Marius Kintel <marius@kintel.net> | 2013-04-18 22:42:51 (GMT) |
commit | b06b4f32f8c0fb616ebba6ddbf3a2297bf185436 (patch) | |
tree | 3ee23c2bdf95cde59f5ca05a312645cdb3a1bab3 /tests | |
parent | 442ab618a7eebc871195a764b23fb152950b181a (diff) | |
parent | 5cee6b58dd1589848518a628a79c582a7320a92e (diff) |
Merge branch 'master' into issue116
Diffstat (limited to 'tests')
-rw-r--r-- | tests/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 1f2345b..7cfa25d 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -354,7 +354,7 @@ if("${CGAL_MAJOR_VERSION}.${CGAL_MINOR_VERSION}" VERSION_LESS 3.6) endif() inclusion(CGAL_DIR CGAL_INCLUDE_DIRS) -if(CMAKE_CXX_COMPILER MATCHES ".*clang.*") +if(CMAKE_CXX_COMPILER MATCHES ".*clang.*" AND NOT STREQUAL ${CGAL_CXX_FLAGS_INIT} "" ) string(REPLACE "-frounding-math" "" CGAL_CXX_FLAGS_INIT ${CGAL_CXX_FLAGS_INIT}) string(REPLACE "--param=ssp-buffer-size=4" "" CGAL_CXX_FLAGS_INIT ${CGAL_CXX_FLAGS_INIT}) endif() |