[ftgl] Fix build failure #9520 (#9521)

* bugfix for [ftgl] build failure #9520. Applied same solution as cbezault did for #7697

* bugfix for [ftgl] build failure #9520. Added suggested changes from the review and clean-up EOL characters.

* [ftgl] remove ftgl:x64-linux=fail from ci.baseline.txt

* [ftgl] build failure #9520 - disable doxygen on Linux

* [ftgl] build failure #9520 - force the compiler to use the C++11 standard

* [ftgl] build failure #9520 - remove ftgl:x64-osx=fail

* [ftgl] build failure #9520 - add missing C++11 standard patch
This commit is contained in:
sma-github 2020-01-27 23:11:39 +01:00 committed by Victor Romero
parent 354733dbf8
commit 28b70b41c4
5 changed files with 82 additions and 32 deletions

View File

@ -0,0 +1,30 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 303fcae..718ae88 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,15 +35,16 @@ ENDIF(BUILD_SHARED_LIBS)
ADD_CUSTOM_TARGET(doc)
-FIND_PACKAGE(Doxygen)
-IF(DOXYGEN_FOUND)
- ADD_CUSTOM_TARGET(doxygen
- ${DOXYGEN_EXECUTABLE}
- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
- COMMENT "Doxygen ...")
- ADD_DEPENDENCIES(doc doxygen)
-
-ENDIF(DOXYGEN_FOUND)
+IF (WIN32) # doxygen only have windows package in vcpkg now.
+ FIND_PACKAGE(Doxygen)
+ IF(DOXYGEN_FOUND)
+ ADD_CUSTOM_TARGET(doxygen
+ ${DOXYGEN_EXECUTABLE}
+ WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+ COMMENT "Doxygen ...")
+ ADD_DEPENDENCIES(doc doxygen)
+ ENDIF(DOXYGEN_FOUND)
+ENDIF()
SUBDIRS(src)

View File

@ -0,0 +1,14 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 718ae88..e53e0da 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,9 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
PROJECT(FTGL)
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
SET(CMAKE_MODULE_PATH ${FTGL_SOURCE_DIR})
SET(VERSION_SERIES 2)

View File

@ -1,5 +1,6 @@
Source: ftgl Source: ftgl
Version: 2.4.0-1 Version: 2.4.0-2
Homepage: https://github.com/frankheckenbach/ftgl
Description: FTGL is a free open source library to enable developers to use arbitrary fonts in their OpenGL (www.opengl.org) applications. Description: FTGL is a free open source library to enable developers to use arbitrary fonts in their OpenGL (www.opengl.org) applications.
Unlike other OpenGL font libraries FTGL uses standard font file formats so doesn't need a preprocessing step to convert the high quality font data into a lesser quality, proprietary format. Unlike other OpenGL font libraries FTGL uses standard font file formats so doesn't need a preprocessing step to convert the high quality font data into a lesser quality, proprietary format.
FTGL uses the Freetype (www.freetype.org) font library to open and 'decode' the fonts. It then takes that output and stores it in a format most efficient for OpenGL rendering. FTGL uses the Freetype (www.freetype.org) font library to open and 'decode' the fonts. It then takes that output and stores it in a format most efficient for OpenGL rendering.

View File

@ -1,5 +1,7 @@
include(vcpkg_common_functions) if (VCPKG_TARGET_IS_WINDOWS)
vcpkg_find_acquire_program(DOXYGEN) # doxygen only have windows package in vcpkg now.
vcpkg_find_acquire_program(DOXYGEN)
endif()
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
@ -7,7 +9,10 @@ vcpkg_from_github(
REF 483639219095ad080538e07ceb5996de901d4e74 REF 483639219095ad080538e07ceb5996de901d4e74
SHA512 d5bf95db8db6a5c9f710bd274cb9bb82e3e67569e8f3ec55b36e068636a09252e6f191e36d8279e61b5d12408c065ce51829fc38d4d7afe5bda724752d2f084f SHA512 d5bf95db8db6a5c9f710bd274cb9bb82e3e67569e8f3ec55b36e068636a09252e6f191e36d8279e61b5d12408c065ce51829fc38d4d7afe5bda724752d2f084f
HEAD_REF master HEAD_REF master
PATCHES Fix-headersFilePath.patch PATCHES
Fix-headersFilePath.patch
01_disable_doxygen.patch
02_enable-cpp11-std.patch
) )
vcpkg_configure_cmake( vcpkg_configure_cmake(
@ -16,10 +21,12 @@ vcpkg_configure_cmake(
) )
vcpkg_install_cmake() vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) if (VCPKG_TARGET_IS_WINDOWS)
vcpkg_test_cmake(PACKAGE_NAME FTGL) vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
else ()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake)
endif()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/ftgl) file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/ftgl/COPYING ${CURRENT_PACKAGES_DIR}/share/ftgl/copyright)

View File

@ -486,8 +486,6 @@ fribidi:arm-uwp=fail
fribidi:x64-linux=fail fribidi:x64-linux=fail
fribidi:x64-osx=fail fribidi:x64-osx=fail
fribidi:x64-uwp=fail fribidi:x64-uwp=fail
ftgl:x64-linux=fail
ftgl:x64-osx=fail
ftgl:x64-uwp=fail ftgl:x64-uwp=fail
fuzzylite:arm-uwp=fail fuzzylite:arm-uwp=fail
fuzzylite:x64-linux=fail fuzzylite:x64-linux=fail