yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3635
committer: Anton Gladky <gladky.anton@xxxxxxxxx>
timestamp: Fri 2015-04-24 08:09:27 +0200
message:
  For clang use -fstack-protector instead of -fstack-protector-strong
modified:
  CMakeLists.txt


--
lp:yade
https://code.launchpad.net/~yade-pkg/yade/git-trunk

Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to https://code.launchpad.net/~yade-pkg/yade/git-trunk/+edit-subscription

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-04-23 16:06:41 +0000
+++ CMakeLists.txt	2015-04-24 06:09:27 +0000
@@ -60,10 +60,12 @@
 #===========================================================
 
 IF ("${CMAKE_CXX_COMPILER} ${CMAKE_CXX_COMPILER_ARG1}" MATCHES ".*clang")
-  ADD_DEFINITIONS("-ftemplate-depth-512")
+  ADD_DEFINITIONS("-ftemplate-depth-512 -fstack-protector")
+ELSE()
+  ADD_DEFINITIONS("-fstack-protector-strong")
 ENDIF()
 
-SET(CMAKE_CXX_FLAGS  ${CMAKE_CXX_FLAGS} " -fPIC -O2 -fstack-protector-strong --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -Wall -std=c++0x")
+SET(CMAKE_CXX_FLAGS  ${CMAKE_CXX_FLAGS} " -fPIC -O2 --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -Wall -std=c++0x")
 
 IF (DEBUG)
   SET(CMAKE_VERBOSE_MAKEFILE 1)