Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
cm3Libraries
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cm3
cm3Libraries
Commits
db52a5cc
Commit
db52a5cc
authored
4 years ago
by
Ling Wu
Browse files
Options
Downloads
Patches
Plain Diff
remove C++11 option: not compatible with torch
parent
341f7f3f
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!309
Master
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
NonLinearSolver/CMakeLists.txt
+7
-6
7 additions, 6 deletions
NonLinearSolver/CMakeLists.txt
cm3apps/CMakeLists.txt
+2
-2
2 additions, 2 deletions
cm3apps/CMakeLists.txt
dG3D/CMakeLists.txt
+7
-6
7 additions, 6 deletions
dG3D/CMakeLists.txt
with
16 additions
and
14 deletions
NonLinearSolver/CMakeLists.txt
+
7
−
6
View file @
db52a5cc
...
...
@@ -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")
...
...
This diff is collapsed.
Click to expand it.
cm3apps/CMakeLists.txt
+
2
−
2
View file @
db52a5cc
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
dG3D/CMakeLists.txt
+
7
−
6
View file @
db52a5cc
...
...
@@ -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
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment