diff options
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/msvc.cmake | 2 | ||||
| -rw-r--r-- | cmake/opentrack-boilerplate.cmake | 1 | ||||
| -rw-r--r-- | cmake/opentrack-platform.cmake | 3 | ||||
| -rw-r--r-- | cmake/opentrack-policy.cmake | 1 | ||||
| -rw-r--r-- | cmake/opentrack-qt.cmake | 4 |
5 files changed, 8 insertions, 3 deletions
diff --git a/cmake/msvc.cmake b/cmake/msvc.cmake index cd967dd9..1e67948d 100644 --- a/cmake/msvc.cmake +++ b/cmake/msvc.cmake @@ -51,6 +51,8 @@ if(CMAKE_PROJECT_NAME STREQUAL "opencv") endif() set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>") + +cmake_policy(SET CMP0069 NEW) set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ON) add_compile_options(-Zi -Zf -Zo -bigobj -cgthreads1 -vd0) diff --git a/cmake/opentrack-boilerplate.cmake b/cmake/opentrack-boilerplate.cmake index a78e0ed0..a3034b44 100644 --- a/cmake/opentrack-boilerplate.cmake +++ b/cmake/opentrack-boilerplate.cmake @@ -170,6 +170,7 @@ function(otr_module n_) add_library(${n} ${link-mode} "${${n}-all}") set_property(TARGET "${n}" PROPERTY PREFIX "") endif() + set_property(TARGET "${n}" PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE) if(NOT arg_NO-QT) otr_qt2("${n}") diff --git a/cmake/opentrack-platform.cmake b/cmake/opentrack-platform.cmake index 23f684f3..274a2189 100644 --- a/cmake/opentrack-platform.cmake +++ b/cmake/opentrack-platform.cmake @@ -146,8 +146,9 @@ if(MSVC) #C4266 - no override available for virtual member function from base type, function is hidden #C4928 - illegal copy-initialization, more than one user-defined conversion has been implicitly applied #C4200: nonstandard extension used: zero-sized array in struct/union + #C4828: The file contains a character starting at offset 0x1433 that is illegal in the current source character set (codepage 65001). - set(warns-disable 4530 4577 4789 4244 4702 4530 4244 4127 4458 4456 4251 4100 4702 4457 4200) + set(warns-disable 4530 4577 4789 4244 4702 4530 4244 4127 4458 4456 4251 4100 4702 4457 4200 4828) foreach(i ${warns-disable}) add_compile_options(-wd${i}) diff --git a/cmake/opentrack-policy.cmake b/cmake/opentrack-policy.cmake index 6426cf87..6eafd90c 100644 --- a/cmake/opentrack-policy.cmake +++ b/cmake/opentrack-policy.cmake @@ -14,6 +14,7 @@ set(_policies CMP0069 CMP0063 CMP0082 + CMP0069 ) foreach(k ${_policies}) if(POLICY ${k}) diff --git a/cmake/opentrack-qt.cmake b/cmake/opentrack-qt.cmake index ab0b751b..274948f4 100644 --- a/cmake/opentrack-qt.cmake +++ b/cmake/opentrack-qt.cmake @@ -23,12 +23,12 @@ function(otr_install_qt_libs) if(NOT TARGET "${i}") continue() endif() - otr_install_lib(${i} "platforms") + otr_install_lib(${i} ".") endforeach() if(WIN32) get_property(foo TARGET Qt6::Core PROPERTY IMPORTED_LOCATION) get_filename_component(foo "${foo}" DIRECTORY) - otr_install_lib("${foo}/../platforms/qwindows.dll" "platforms") + otr_install_lib("${foo}/../plugins/platforms/qwindows.dll" "platforms") endif() endfunction() |