Reolved merge conflict

ced828b8 · frey_m · 678e18d6 · 29579d8a · ced828b8
Commit ced828b8 authored 8 years ago by frey_m
--- a/CMakeModules/CCSEOptions.cmake
+++ b/CMakeModules/CCSEOptions.cmake
@@ -68,11 +68,9 @@ endif()


 if(CMAKE_COMPILER_IS_GNUCXX)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wno-deprecated")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -ftemplate-depth=128 -Wno-deprecated")
 endif(CMAKE_COMPILER_IS_GNUCXX)

 list(APPEND BL_DEFINES "OPAL")

-set_directory_properties(PROPERTIES COMPILE_DEFINITIONS "${BL_DEFINES}")
-
-
+set_directory_properties(PROPERTIES COMPILE_DEFINITIONS "${BL_DEFINES}")
\ No newline at end of file