diff --git a/NonLinearSolver/CMakeLists.txt b/NonLinearSolver/CMakeLists.txt index e905081c969b5a43bca233c6b356384652e90fb5..a549f577c05b533999b8b94d976a109103ec2542 100644 --- a/NonLinearSolver/CMakeLists.txt +++ b/NonLinearSolver/CMakeLists.txt @@ -21,12 +21,13 @@ endif(CMAKE_BUILD_TYPE MATCHES "debug") set(CMAKE_C_FLAGS " ${CMAKE_C_FLAGS} -DNONLOCALGMSH") set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -DNONLOCALGMSH") -if(ENABLE_CXX11) - # in recent cmake versions we could do e.g. set(CMAKE_CXX_STANDARD 11) - set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -std=c++11") -else() - set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -std=c++0x") -endif(ENABLE_CXX11) +#not compatible with ABI option of torch +#if(ENABLE_CXX11) +# # in recent cmake versions we could do e.g. set(CMAKE_CXX_STANDARD 11) +# set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -std=c++11") +#else() +# set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -std=c++0x") +#endif(ENABLE_CXX11) #set(GLIBCXX_USE_CXX11_ABI 0) #set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -D_GLIBCXX_USE_CXX11_ABI=0") diff --git a/cm3apps/CMakeLists.txt b/cm3apps/CMakeLists.txt index 749b9335f38624ecdc559b8deacfc626bc556aa0..0c62b54f69e99f69c872f61eb740687b01c5aed3 100644 --- a/cm3apps/CMakeLists.txt +++ b/cm3apps/CMakeLists.txt @@ -103,8 +103,8 @@ file(GLOB HDR RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/src *.h) if(HAVE_MPI) cmake_force_cxx_compiler(${MPI_COMPILER} "MPI C++ Compiler") 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) # Testing diff --git a/dG3D/CMakeLists.txt b/dG3D/CMakeLists.txt index c0f578a7abfd529a3bbdb2f8bad6c0eb01e594a5..896d3822d38f250a9e6d5a42233dca6a6b7c9a9e 100644 --- a/dG3D/CMakeLists.txt +++ b/dG3D/CMakeLists.txt @@ -26,12 +26,13 @@ cmake_policy(SET CMP0012 NEW) set(CMAKE_C_FLAGS " ${CMAKE_C_FLAGS} -DNONLOCALGMSH") set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -DNONLOCALGMSH") -if(ENABLE_CXX11) - # in recent cmake versions we could do e.g. set(CMAKE_CXX_STANDARD 11) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") -else() - set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -std=c++0x") -endif(ENABLE_CXX11) +#not compatible with ABI option of torch +#if(ENABLE_CXX11) +# # in recent cmake versions we could do e.g. set(CMAKE_CXX_STANDARD 11) +# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") +#else() +# set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -std=c++0x") +#endif(ENABLE_CXX11) project(dG3D CXX)