Przeglądaj źródła

Fix freetype2 headers installation - missed one file earlier.

Yao Wei Tjong 姚伟忠 11 lat temu
rodzic
commit
2b353512c3

+ 1 - 1
CMake/Modules/Urho3D-CMake-common.cmake

@@ -905,7 +905,7 @@ macro (define_source_files)
                 string (REGEX REPLACE ";${PATTERN};" ";;" H_FILES_WITH_SENTINEL "${H_FILES_WITH_SENTINEL}")
             endforeach ()
         endforeach ()
-        set (CPP_FILES ${CPP_FILES_WITH_SENTINEL})      # Convert strings back to lists, the sentinel is harmless
+        set (CPP_FILES ${CPP_FILES_WITH_SENTINEL})      # Convert strings back to lists, extra sentinels are harmless
         set (H_FILES ${H_FILES_WITH_SENTINEL})
     endif ()
     list (APPEND CPP_FILES ${ARG_EXTRA_CPP_FILES})

+ 1 - 0
Source/ThirdParty/FreeType/CMakeLists.txt

@@ -81,3 +81,4 @@ setup_library ()
 
 # Install headers for building the Urho3D library
 install_header_files (DIRECTORY include/freetype DESTINATION ${DEST_INCLUDE_DIR}/ThirdParty FILES_MATCHING PATTERN *.h BUILD_TREE_ONLY)
+install_header_files (FILES include/ft2build.h DESTINATION ${DEST_INCLUDE_DIR}/ThirdParty FILES_MATCHING PATTERN *.h BUILD_TREE_ONLY)

+ 1 - 1
Source/Urho3D/UI/FontFaceFreeType.cpp

@@ -32,7 +32,7 @@
 #include "../Graphics/Texture2D.h"
 #include "../UI/UI.h"
 
-#include <freetype/config/ftheader.h>
+#include <ft2build.h>
 #include FT_FREETYPE_H
 #include FT_TRUETYPE_TABLES_H