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
Gauthier Quesnel
irritator
Commits
176b91e8
Commit
176b91e8
authored
Jul 02, 2020
by
Gauthier Quesnel
Browse files
hayai: use /Zc:__cplusplus to remove std::random_shuffle error
parent
92984edd
Changes
3
Hide whitespace changes
Inline
Side-by-side
app/CMakeLists.txt
View file @
176b91e8
...
...
@@ -12,7 +12,7 @@ target_compile_options(app
-pipe -march=native
$<$<CONFIG:Debug>:-Og -Wall -Wextra>>
$<$<CXX_COMPILER_ID:MSVC>:
/EHsc /bigobj
/EHsc /bigobj
/Zc:__cplusplus /std:c++latest
$<$<CONFIG:Debug>:/Od /W3 /Zi>>
)
target_compile_definitions
(
app
...
...
app/gui/CMakeLists.txt
View file @
176b91e8
...
...
@@ -65,6 +65,15 @@ target_link_libraries(irritator-gui
$<$<PLATFORM_ID:Windows>:d3dcompiler>
libirritator
)
target_compile_options
(
irritator-gui
PRIVATE
$<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:GNU>>:
-pipe -march=native
$<$<CONFIG:Debug>:-Og -Wall -Wextra>>
$<$<CXX_COMPILER_ID:MSVC>:
/EHsc /bigobj /Zc:__cplusplus /std:c++latest
$<$<CONFIG:Debug>:/Od /W3 /Zi>>
)
target_compile_definitions
(
irritator-gui
PRIVATE
$<$<CXX_COMPILER_ID:MSVC>:_CRT_SECURE_NO_WARNINGS>
...
...
lib/CMakeLists.txt
View file @
176b91e8
...
...
@@ -26,8 +26,8 @@ target_compile_options(libirritator
-pipe -march=native
$<$<CONFIG:Debug>:-O0 -ggdb3 -Wall -Wextra>>
$<$<CXX_COMPILER_ID:MSVC>:
/EHsc /bigobj
$<$<CONFIG:Debug>:
/std:c++latest
/Od /W3 /Zi>>
)
/EHsc /bigobj
/Zc:__cplusplus /std:c++latest
$<$<CONFIG:Debug>:/Od /W3 /Zi>>
)
target_include_directories
(
libirritator PUBLIC
$<BUILD_INTERFACE:
${
CMAKE_CURRENT_SOURCE_DIR
}
/include>
...
...
@@ -99,7 +99,7 @@ function(irritator_add_test test_name)
-pipe -march=native
$<$<CONFIG:Debug>:-Og -Wall -Wextra>>
$<$<CXX_COMPILER_ID:MSVC>:
/EHsc /bigobj
/EHsc /bigobj
/Zc:__cplusplus /std:c++latest
$<$<CONFIG:Debug>:/Od /W3 /Zi>>
)
target_compile_definitions
(
${
test_name
}
...
...
@@ -134,7 +134,7 @@ function(irritator_add_benchmark test_name)
-pipe -march=native
$<$<CONFIG:Debug>:-Og -Wall -Wextra>>
$<$<CXX_COMPILER_ID:MSVC>:
/EHsc /bigobj
/EHsc /bigobj
/Zc:__cplusplus /std:c++latest
$<$<CONFIG:Debug>:/Od /W3 /Zi>>
)
target_compile_definitions
(
${
test_name
}
...
...
Write
Preview
Markdown
is supported
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