Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
libHexEx
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
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
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
HexEx
libHexEx
Commits
63da6201
Commit
63da6201
authored
4 years ago
by
Max Lyon
Browse files
Options
Downloads
Patches
Plain Diff
require c++11 for the unittests
parent
e20ac331
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+4
-7
4 additions, 7 deletions
CMakeLists.txt
tests/CMakeLists.txt
+7
-0
7 additions, 0 deletions
tests/CMakeLists.txt
with
11 additions
and
7 deletions
CMakeLists.txt
+
4
−
7
View file @
63da6201
...
...
@@ -62,13 +62,6 @@ add_library (HexExStatic STATIC ${SOURCES})
target_link_libraries
(
HexEx
${
LIBRARIES
}
OpenVolumeMesh
)
target_link_libraries
(
HexExStatic
${
LIBRARIES
}
OpenVolumeMesh
)
set_target_properties
(
HexEx HexExStatic
PROPERTIES
CXX_STANDARD 11
CXX_STANDARD_REQUIRED YES
CXX_EXTENSIONS NO
)
#
# In order for the exact predicates to work the compiler
# must not generate x87 FPU code as this leads to the use
...
...
@@ -113,6 +106,8 @@ set_target_properties (HexEx
COMPILE_FLAGS
"
${
HEXEX_COMPILE_FLAGS
}
"
DEFINE_SYMBOLS
"-DHEXEX_EXPORT_SYMBOLS"
CXX_STANDARD 11
CXX_STANDARD_REQUIRED YES
CXX_EXTENSIONS NO
)
target_include_directories
(
HexEx
...
...
@@ -131,6 +126,8 @@ set_target_properties (HexExStatic
COMPILE_FLAGS
"
${
HEXEX_COMPILE_FLAGS
}
"
DEFINE_SYMBOLS
"-DHEXEX_EXPORT_SYMBOLS"
CXX_STANDARD 11
CXX_STANDARD_REQUIRED YES
CXX_EXTENSIONS NO
)
set_property
(
TARGET HexExStatic PROPERTY POSITION_INDEPENDENT_CODE ON
)
...
...
This diff is collapsed.
Click to expand it.
tests/CMakeLists.txt
+
7
−
0
View file @
63da6201
...
...
@@ -67,6 +67,13 @@ if ( HEXEX_BUILD_UNIT_TESTS )
set_target_properties
(
unittests PROPERTIES COMPILE_FLAGS
""
)
endif
()
set_target_properties
(
unittests
PROPERTIES
CXX_STANDARD 11
CXX_STANDARD_REQUIRED YES
CXX_EXTENSIONS NO
)
if
(
NOT WIN32
)
#copy test files to unittest output dir
acg_copy_after_build
(
unittests
${
CMAKE_CURRENT_LIST_DIR
}
/testdata
${
OUTPUT_DIR
}
/testdata
)
...
...
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