mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-25 01:38:59 +08:00
101931754a
* Update to 13.4.4 * Update versions * Fix obsolete zziplib reference * Fix another resource path * Update versions * Patch pc file generation * Update versions * Force uniform cfg install path for osx * Update versions * Acquire swig if needed * Update versions
31 lines
1.3 KiB
Diff
31 lines
1.3 KiB
Diff
diff --git a/CMake/ConfigureBuild.cmake b/CMake/ConfigureBuild.cmake
|
|
index 614332c..f4bc402 100644
|
|
--- a/CMake/ConfigureBuild.cmake
|
|
+++ b/CMake/ConfigureBuild.cmake
|
|
@@ -185,6 +185,13 @@ if (UNIX)
|
|
else()
|
|
set(OGRE_ADDITIONAL_LIBS "${OGRE_ADDITIONAL_LIBS} ${FreeImage_LIBRARY_REL}")
|
|
endif()
|
|
+ set(PC_REQUIRES_STATIC "")
|
|
+ if(OGRE_BUILD_COMPONENT_OVERLAY)
|
|
+ string(APPEND PC_REQUIRES_STATIC " freetype2")
|
|
+ endif()
|
|
+ if(X11_X11_LIB)
|
|
+ string(APPEND PC_REQUIRES_STATIC " x11 xt xaw7 gl")
|
|
+ endif()
|
|
configure_file(${OGRE_TEMPLATES_DIR}/OGREStatic.pc.in ${PROJECT_BINARY_DIR}/pkgconfig/OGRE.pc @ONLY)
|
|
else ()
|
|
configure_file(${OGRE_TEMPLATES_DIR}/OGRE.pc.in ${PROJECT_BINARY_DIR}/pkgconfig/OGRE.pc @ONLY)
|
|
diff --git a/CMake/Templates/OGREStatic.pc.in b/CMake/Templates/OGREStatic.pc.in
|
|
index 4e4202b..f9b7f5a 100644
|
|
--- a/CMake/Templates/OGREStatic.pc.in
|
|
+++ b/CMake/Templates/OGREStatic.pc.in
|
|
@@ -8,6 +8,6 @@ Name: OGRE (static lib)
|
|
Description: Object-Oriented Graphics Rendering Engine
|
|
Version: @OGRE_VERSION@
|
|
URL: http://www.ogre3d.org
|
|
-Requires: freetype2, zziplib, x11, xt, xaw7, gl
|
|
+Requires: @PC_REQUIRES_STATIC@
|
|
Libs: -L${libdir} -L${plugindir} -lOgreMain@OGRE_LIB_SUFFIX@ @OGRE_ADDITIONAL_LIBS@
|
|
Cflags: -I${includedir} -I${includedir}/OGRE @OGRE_CFLAGS@
|