diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2017-10-28 17:29:56 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2017-10-28 17:29:56 +0200 |
| commit | b2ceb8fd3f3a6eb991e30844d567f9dade87a92d (patch) | |
| tree | b6c6e11476253b7239667c48aea49542811974b1 | |
| parent | 8f8014bf7178c6c06d5bb1760ba6619f161d1ac6 (diff) | |
cmake: stuff
| -rw-r--r-- | cmake/opentrack-boilerplate.cmake | 2 | ||||
| -rw-r--r-- | cmake/opentrack-platform.cmake | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/cmake/opentrack-boilerplate.cmake b/cmake/opentrack-boilerplate.cmake index d3becd56..00862d20 100644 --- a/cmake/opentrack-boilerplate.cmake +++ b/cmake/opentrack-boilerplate.cmake @@ -46,7 +46,7 @@ function(otr_qt n) if(".${${n}-hh}" STREQUAL ".") message(FATAL_ERROR "project ${n} not globbed") endif() - qt5_wrap_cpp(${n}-moc ${${n}-hh} OPTIONS --no-notes) + qt5_wrap_cpp(${n}-moc ${${n}-hh} ${${n}-cc} OPTIONS --no-notes) qt5_wrap_ui(${n}-uih ${${n}-ui}) qt5_add_resources(${n}-rcc ${${n}-rc}) diff --git a/cmake/opentrack-platform.cmake b/cmake/opentrack-platform.cmake index e7849434..4aa4d49e 100644 --- a/cmake/opentrack-platform.cmake +++ b/cmake/opentrack-platform.cmake @@ -62,6 +62,7 @@ if(MSVC) add_definitions(-DNOMINMAX -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS -D_NO_DEBUG_HEAP) add_definitions(-D_ITERATOR_DEBUG_LEVEL=0) add_definitions(-D_HAS_EXCEPTIONS=0) + add_definitions(-D_SILENCE_CXX17_NEGATORS_DEPRECATION_WARNING -D_SILENCE_CXX17_ADAPTOR_TYPEDEFS_DEPRECATION_WARNING) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Zi") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Zi") |