yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 4080
committer: Anton Gladky <gladky.anton@xxxxxxxxx>
timestamp: Mon 2014-07-14 22:08:34 +0200
message:
  Set C++11 only for CXX-files, not C
modified:
  CMakeLists.txt
  py/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	2014-07-11 18:27:33 +0000
+++ CMakeLists.txt	2014-07-14 20:08:34 +0000
@@ -63,7 +63,7 @@
 
 #===========================================================
 
-ADD_DEFINITIONS("-std=c++0x")
+SET(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -std=c++0x")
 
 #===========================================================
 

=== modified file 'py/CMakeLists.txt'
--- py/CMakeLists.txt	2014-07-11 18:29:03 +0000
+++ py/CMakeLists.txt	2014-07-14 20:08:34 +0000
@@ -5,7 +5,6 @@
     MESSAGE(STATUS "Use system gts version")
   ELSE (PY_gts)
     MESSAGE(STATUS "Use embedded version of gts. Please, consider installing the corresponding package")
-    REMOVE_DEFINITIONS("-std=c++0x")
     FILE(GLOB SRC_PYGTS "${CMAKE_CURRENT_SOURCE_DIR}/3rd-party/pygts-0.3.1/*.c")
     ADD_LIBRARY(_gts SHARED ${SRC_PYGTS})
     SET_TARGET_PROPERTIES(_gts PROPERTIES PREFIX "")
@@ -13,7 +12,6 @@
     INSTALL(FILES 3rd-party/pygts-0.3.1/__init__.py DESTINATION ${YADE_LIB_PATH}/py/gts)
     INSTALL(FILES 3rd-party/pygts-0.3.1/pygts.py DESTINATION ${YADE_LIB_PATH}/py/gts)
     INSTALL(TARGETS _gts DESTINATION ${YADE_LIB_PATH}/py/gts)
-    ADD_DEFINITIONS("-std=c++0x")
   ENDIF (PY_gts)
 ENDIF(ENABLE_GTS)
 #==================pygts=========================================