[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2-demos] master a49b9be 01/41: [ftinspect] Update build system
From: |
Werner Lemberg |
Subject: |
[freetype2-demos] master a49b9be 01/41: [ftinspect] Update build system settings. |
Date: |
Mon, 3 Oct 2022 11:27:00 -0400 (EDT) |
branch: master
commit a49b9be23d59daff02e0f357cf6fe60b71e5f720
Author: Charlie Jiang <w@chariri.moe>
Commit: Werner Lemberg <wl@gnu.org>
[ftinspect] Update build system settings.
* src/ftinspect/CMakeLists.txt: Fix MSVC-only options. Require Qt 5.15 and
enable higher warning level.
* src/ftinspect/meson.build: Set C++ version. Require Qt 5.15.
---
src/ftinspect/CMakeLists.txt | 14 ++++++++++++--
src/ftinspect/meson.build | 4 +++-
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/ftinspect/CMakeLists.txt b/src/ftinspect/CMakeLists.txt
index c910e05..fc73093 100644
--- a/src/ftinspect/CMakeLists.txt
+++ b/src/ftinspect/CMakeLists.txt
@@ -4,7 +4,7 @@ set(CMAKE_CXX_STANDARD 11)
project("ftinspect")
-if (WIN32)
+if (MSVC)
add_compile_options("/utf-8")
endif ()
@@ -12,7 +12,7 @@ set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
set(CMAKE_AUTOUIC ON)
-find_package(Qt5 COMPONENTS Widgets REQUIRED)
+find_package(Qt5 5.15 COMPONENTS Widgets REQUIRED)
find_package(Freetype REQUIRED)
add_executable(ftinspect
@@ -36,3 +36,13 @@ target_link_libraries(ftinspect
Qt5::Core Qt5::Widgets
Freetype::Freetype
)
+
+# Fix for CMake prior to 3.15
+string(REGEX REPLACE "/W[3|4]" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+if(MSVC)
+ target_compile_options(ftinspect PRIVATE "/W4" "/wd4100")
+else(CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
+ OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+ target_compile_options(ftinspect PRIVATE "-Wall" "-Wextra"
+ "-Wpedantic" "-Wno-unused-parameter")
+endif()
diff --git a/src/ftinspect/meson.build b/src/ftinspect/meson.build
index 9d2abbd..3901977 100644
--- a/src/ftinspect/meson.build
+++ b/src/ftinspect/meson.build
@@ -14,7 +14,8 @@
qt5 = import('qt5')
qt5_dep = dependency('qt5',
required: false,
- modules: ['Core', 'Gui', 'Widgets'])
+ modules: ['Core', 'Gui', 'Widgets'],
+ version : '>=5.15')
# Don't compile `ftinspect` if Qt5 is not found. This can happen
# when cross-compiling to a different system.
@@ -48,6 +49,7 @@ if qt5_dep.found()
sources,
moc_files,
dependencies: [qt5_dep, libfreetype2_dep],
+ override_options : ['cpp_std=c++11'],
install: true)
endif
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2-demos] master a49b9be 01/41: [ftinspect] Update build system settings.,
Werner Lemberg <=