diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2018-07-10 13:11:21 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2018-07-10 13:11:21 +0200 |
| commit | 8562e190d63710f77bf00b1b2cd7ccde6153eef0 (patch) | |
| tree | 5b4ead523bf98780e3e1a759ba3592d37708ff8f | |
| parent | 1173eb0fb61e8409e0530c98726ed7b485eb834c (diff) | |
fix build
| -rw-r--r-- | cmake/opentrack-install.cmake | 4 | ||||
| -rw-r--r-- | cmake/opentrack-platform.cmake | 4 | ||||
| -rw-r--r-- | options/metatype.hpp | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/cmake/opentrack-install.cmake b/cmake/opentrack-install.cmake index 392fb3b2..45f6ce18 100644 --- a/cmake/opentrack-install.cmake +++ b/cmake/opentrack-install.cmake @@ -28,7 +28,7 @@ function(install_sources) otr_install_misc("${opentrack-doc-src-pfx}" FILES "${CMAKE_SOURCE_DIR}/CMakeLists.txt") otr_install_misc("${opentrack-doc-src-pfx}" FILES "${CMAKE_SOURCE_DIR}/README.md") - otr_install_misc("${opentrack-doc-src-pfx}" FILES "${CMAKE_SOURCE_DIR}/CONTRIBUTING.md") + otr_install_misc("${opentrack-doc-src-pfx}" FILES "${CMAKE_SOURCE_DIR}/.github/CONTRIBUTING.md") otr_install_misc("${opentrack-doc-src-pfx}" FILES "${CMAKE_SOURCE_DIR}/WARRANTY.txt") otr_install_misc("${opentrack-doc-src-pfx}" FILES "${CMAKE_SOURCE_DIR}/OPENTRACK-LICENSING.txt") otr_install_misc("${opentrack-doc-src-pfx}" FILES "${CMAKE_SOURCE_DIR}/AUTHORS.md") @@ -55,7 +55,7 @@ otr_install_misc("${opentrack-doc-pfx}" FILES ${CMAKE_SOURCE_DIR}/README.md) otr_install_misc("${opentrack-doc-src-pfx}" FILES "${CMAKE_SOURCE_DIR}/CMakeLists.txt") otr_install_misc("${opentrack-doc-src-pfx}" FILES "${CMAKE_SOURCE_DIR}/README.md") -otr_install_misc("${opentrack-doc-src-pfx}" FILES "${CMAKE_SOURCE_DIR}/CONTRIBUTING.md") +otr_install_misc("${opentrack-doc-src-pfx}" FILES "${CMAKE_SOURCE_DIR}/.github/CONTRIBUTING.md") otr_install_misc("${opentrack-doc-src-pfx}" FILES "${CMAKE_SOURCE_DIR}/WARRANTY.txt") otr_install_misc("${opentrack-doc-src-pfx}" FILES "${CMAKE_SOURCE_DIR}/OPENTRACK-LICENSING.txt") otr_install_misc("${opentrack-doc-src-pfx}" FILES "${CMAKE_SOURCE_DIR}/AUTHORS.md") diff --git a/cmake/opentrack-platform.cmake b/cmake/opentrack-platform.cmake index 27272636..285c07c7 100644 --- a/cmake/opentrack-platform.cmake +++ b/cmake/opentrack-platform.cmake @@ -60,6 +60,8 @@ if(MSVC) add_definitions(-D_ITERATOR_DEBUG_LEVEL=0) add_definitions(-D_HAS_EXCEPTIONS=0) add_definitions(-D_USE_MATH_DEFINES=1) + add_definitions(-D_SILENCE_CXX17_NEGATORS_DEPRECATION_WARNING) + add_definitions(-D_SILENCE_CXX17_ADAPTOR_TYPEDEFS_DEPRECATION_WARNING) if(MSVC_VERSION GREATER 1909) # visual studio 2017 set(__stuff "-permissive-") @@ -97,7 +99,7 @@ set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) set(CMAKE_SKIP_INSTALL_RPATH FALSE) set(CMAKE_SKIP_RPATH FALSE) -set(CMAKE_INCLUDE_CURRENT_DIR OFF) +set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC OFF) set(CMAKE_POSITION_INDEPENDENT_CODE ON) diff --git a/options/metatype.hpp b/options/metatype.hpp index 9d3cbda1..27e37c80 100644 --- a/options/metatype.hpp +++ b/options/metatype.hpp @@ -9,13 +9,13 @@ #include "defs.hpp" #include <QMetaType> -#ifndef OPENTRACK_METATYPE_ +#if !defined OPENTRACK_METATYPE_ || defined Q_CREATOR_RUN # define OPENTRACK_METATYPE(x) Q_DECLARE_METATYPE(x) #else # define OPENTRACK_METATYPE(x) Q_DECLARE_METATYPE(x) OPENTRACK_METATYPE_(x) #endif -#if !defined __clang_analyzer__ && !defined Q_CREATOR_RUN +#if !defined __clang_analyzer__ OPENTRACK_METATYPE(QList<double>); OPENTRACK_METATYPE(QList<float>); OPENTRACK_METATYPE(QList<int>); |