diff options
| author | sma-github <55330739+sma-github@users.noreply.github.com> | 2020-01-27 23:11:39 +0100 |
|---|---|---|
| committer | Victor Romero <romerosanchezv@gmail.com> | 2020-01-27 14:11:39 -0800 |
| commit | 28b70b41c482c679cbcea8c9ea6d8d598cb3c648 (patch) | |
| tree | d07708e7eae4981605eb6ff11a5bfaedf62e1198 /ports/ftgl/01_disable_doxygen.patch | |
| parent | 354733dbf8aa53571c7f7b451565742f42156339 (diff) | |
| download | vcpkg-28b70b41c482c679cbcea8c9ea6d8d598cb3c648.tar.gz vcpkg-28b70b41c482c679cbcea8c9ea6d8d598cb3c648.zip | |
[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
Diffstat (limited to 'ports/ftgl/01_disable_doxygen.patch')
| -rw-r--r-- | ports/ftgl/01_disable_doxygen.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/ports/ftgl/01_disable_doxygen.patch b/ports/ftgl/01_disable_doxygen.patch new file mode 100644 index 000000000..5443554e7 --- /dev/null +++ b/ports/ftgl/01_disable_doxygen.patch @@ -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) + |