Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
HexEx
libHexEx
Commits
63da6201
Commit
63da6201
authored
Oct 21, 2020
by
Max Lyon
Browse files
require c++11 for the unittests
parent
e20ac331
Changes
2
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
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
)
...
...
tests/CMakeLists.txt
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
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment