Skip to content
Snippets Groups Projects
Commit db52a5cc authored by Ling Wu's avatar Ling Wu
Browse files

remove C++11 option: not compatible with torch

parent 341f7f3f
No related branches found
No related tags found
1 merge request!309Master
...@@ -21,12 +21,13 @@ endif(CMAKE_BUILD_TYPE MATCHES "debug") ...@@ -21,12 +21,13 @@ endif(CMAKE_BUILD_TYPE MATCHES "debug")
set(CMAKE_C_FLAGS " ${CMAKE_C_FLAGS} -DNONLOCALGMSH") set(CMAKE_C_FLAGS " ${CMAKE_C_FLAGS} -DNONLOCALGMSH")
set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -DNONLOCALGMSH") set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -DNONLOCALGMSH")
if(ENABLE_CXX11) #not compatible with ABI option of torch
# in recent cmake versions we could do e.g. set(CMAKE_CXX_STANDARD 11) #if(ENABLE_CXX11)
set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -std=c++11") # # in recent cmake versions we could do e.g. set(CMAKE_CXX_STANDARD 11)
else() # set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -std=c++11")
set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -std=c++0x") #else()
endif(ENABLE_CXX11) # set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -std=c++0x")
#endif(ENABLE_CXX11)
#set(GLIBCXX_USE_CXX11_ABI 0) #set(GLIBCXX_USE_CXX11_ABI 0)
#set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -D_GLIBCXX_USE_CXX11_ABI=0") #set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -D_GLIBCXX_USE_CXX11_ABI=0")
......
...@@ -103,8 +103,8 @@ file(GLOB HDR RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/src *.h) ...@@ -103,8 +103,8 @@ file(GLOB HDR RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/src *.h)
if(HAVE_MPI) if(HAVE_MPI)
cmake_force_cxx_compiler(${MPI_COMPILER} "MPI C++ Compiler") cmake_force_cxx_compiler(${MPI_COMPILER} "MPI C++ Compiler")
set(CMAKE_C_FLAGS " ${CMAKE_C_FLAGS}") set(CMAKE_C_FLAGS " ${CMAKE_C_FLAGS}")
set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -std=c++11") #not compatible with ABI option of torch
#set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -std=c++11")
endif(HAVE_MPI) endif(HAVE_MPI)
# Testing # Testing
......
...@@ -26,12 +26,13 @@ cmake_policy(SET CMP0012 NEW) ...@@ -26,12 +26,13 @@ cmake_policy(SET CMP0012 NEW)
set(CMAKE_C_FLAGS " ${CMAKE_C_FLAGS} -DNONLOCALGMSH") set(CMAKE_C_FLAGS " ${CMAKE_C_FLAGS} -DNONLOCALGMSH")
set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -DNONLOCALGMSH") set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -DNONLOCALGMSH")
if(ENABLE_CXX11) #not compatible with ABI option of torch
# in recent cmake versions we could do e.g. set(CMAKE_CXX_STANDARD 11) #if(ENABLE_CXX11)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") # # in recent cmake versions we could do e.g. set(CMAKE_CXX_STANDARD 11)
else() # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -std=c++0x") #else()
endif(ENABLE_CXX11) # set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -std=c++0x")
#endif(ENABLE_CXX11)
project(dG3D CXX) project(dG3D CXX)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment