| ... |
... |
@@ -498,39 +498,41 @@ if (BUILD_FRAMEWORK) |
|
498
|
498
|
endif ()
|
|
499
|
499
|
|
|
500
|
500
|
|
|
501
|
|
-set(PKG_CONFIG_REQUIRED_PRIVATE "")
|
|
502
|
|
-set(PKG_CONFIG_LIBS_PRIVATE "")
|
|
|
501
|
+set(PKGCONFIG_REQUIRES "")
|
|
|
502
|
+set(PKGCONFIG_REQUIRES_PRIVATE "")
|
|
|
503
|
+set(PKGCONFIG_LIBS "-L\${libdir} -lfreetype")
|
|
|
504
|
+set(PKGCONFIG_LIBS_PRIVATE "")
|
|
503
|
505
|
|
|
504
|
506
|
if (ZLIB_FOUND)
|
|
505
|
507
|
target_link_libraries(freetype PRIVATE ${ZLIB_LIBRARIES})
|
|
506
|
508
|
target_include_directories(freetype PRIVATE ${ZLIB_INCLUDE_DIRS})
|
|
507
|
|
- list(APPEND PKG_CONFIG_REQUIRED_PRIVATE "zlib")
|
|
|
509
|
+ list(APPEND PKGCONFIG_REQUIRES_PRIVATE "zlib")
|
|
508
|
510
|
endif ()
|
|
509
|
511
|
if (BZIP2_FOUND)
|
|
510
|
512
|
target_link_libraries(freetype PRIVATE ${BZIP2_LIBRARIES})
|
|
511
|
513
|
target_include_directories(freetype PRIVATE ${BZIP2_INCLUDE_DIR}) # not BZIP2_INCLUDE_DIRS
|
|
512
|
514
|
if (PC_BZIP2_FOUND)
|
|
513
|
|
- list(APPEND PKG_CONFIG_REQUIRED_PRIVATE "bzip2")
|
|
|
515
|
+ list(APPEND PKGCONFIG_REQUIRES_PRIVATE "bzip2")
|
|
514
|
516
|
else ()
|
|
515
|
|
- list(APPEND PKG_CONFIG_LIBS_PRIVATE "-lbz2")
|
|
|
517
|
+ list(APPEND PKGCONFIG_LIBS_PRIVATE "-lbz2")
|
|
516
|
518
|
endif ()
|
|
517
|
519
|
endif ()
|
|
518
|
520
|
if (PNG_FOUND)
|
|
519
|
521
|
target_link_libraries(freetype PRIVATE ${PNG_LIBRARIES})
|
|
520
|
522
|
target_compile_definitions(freetype PRIVATE ${PNG_DEFINITIONS})
|
|
521
|
523
|
target_include_directories(freetype PRIVATE ${PNG_INCLUDE_DIRS})
|
|
522
|
|
- list(APPEND PKG_CONFIG_REQUIRED_PRIVATE "libpng")
|
|
|
524
|
+ list(APPEND PKGCONFIG_REQUIRES_PRIVATE "libpng")
|
|
523
|
525
|
endif ()
|
|
524
|
526
|
if (HarfBuzz_FOUND)
|
|
525
|
527
|
target_link_libraries(freetype PRIVATE ${HarfBuzz_LIBRARY})
|
|
526
|
528
|
target_include_directories(freetype PRIVATE ${HarfBuzz_INCLUDE_DIRS})
|
|
527
|
|
- list(APPEND PKG_CONFIG_REQUIRED_PRIVATE "harfbuzz >= ${HARFBUZZ_MIN_VERSION}")
|
|
|
529
|
+ list(APPEND PKGCONFIG_REQUIRES_PRIVATE "harfbuzz >= ${HARFBUZZ_MIN_VERSION}")
|
|
528
|
530
|
endif ()
|
|
529
|
531
|
if (BROTLIDEC_FOUND)
|
|
530
|
532
|
target_link_libraries(freetype PRIVATE ${BROTLIDEC_LIBRARIES})
|
|
531
|
533
|
target_compile_definitions(freetype PRIVATE ${BROTLIDEC_DEFINITIONS})
|
|
532
|
534
|
target_include_directories(freetype PRIVATE ${BROTLIDEC_INCLUDE_DIRS})
|
|
533
|
|
- list(APPEND PKG_CONFIG_REQUIRED_PRIVATE "libbrotlidec")
|
|
|
535
|
+ list(APPEND PKGCONFIG_REQUIRES_PRIVATE "libbrotlidec")
|
|
534
|
536
|
endif ()
|
|
535
|
537
|
|
|
536
|
538
|
|
| ... |
... |
@@ -557,7 +559,7 @@ if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL) |
|
557
|
559
|
# Generate the pkg-config file
|
|
558
|
560
|
file(READ "${PROJECT_SOURCE_DIR}/builds/unix/freetype2.in" FREETYPE2_PC_IN)
|
|
559
|
561
|
|
|
560
|
|
- string(REPLACE ";" ", " PKG_CONFIG_REQUIRED_PRIVATE "${PKG_CONFIG_REQUIRED_PRIVATE}")
|
|
|
562
|
+ string(REPLACE ";" ", " PKGCONFIG_REQUIRES_PRIVATE "${PKGCONFIG_REQUIRES_PRIVATE}")
|
|
561
|
563
|
|
|
562
|
564
|
string(REPLACE "%prefix%" ${CMAKE_INSTALL_PREFIX}
|
|
563
|
565
|
FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
|
| ... |
... |
@@ -569,10 +571,26 @@ if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL) |
|
569
|
571
|
FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
|
|
570
|
572
|
string(REPLACE "%ft_version%" "${LIBTOOL_CURRENT}.${LIBTOOL_REVISION}.${LIBTOOL_AGE}"
|
|
571
|
573
|
FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
|
|
572
|
|
- string(REPLACE "%REQUIRES_PRIVATE%" "${PKG_CONFIG_REQUIRED_PRIVATE}"
|
|
573
|
|
- FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
|
|
574
|
|
- string(REPLACE "%LIBS_PRIVATE%" "${PKG_CONFIG_LIBS_PRIVATE}"
|
|
575
|
|
- FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
|
|
|
574
|
+
|
|
|
575
|
+ if (BUILD_SHARED_LIBS)
|
|
|
576
|
+ string(REPLACE "%PKGCONFIG_REQUIRES%" "${PKGCONFIG_REQUIRES}"
|
|
|
577
|
+ FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
|
|
|
578
|
+ string(REPLACE "%PKGCONFIG_REQUIRES_PRIVATE%" "${PKGCONFIG_REQUIRES_PRIVATE}"
|
|
|
579
|
+ FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
|
|
|
580
|
+ string(REPLACE "%PKGCONFIG_LIBS%" "${PKGCONFIG_LIBS}"
|
|
|
581
|
+ FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
|
|
|
582
|
+ string(REPLACE "%PKGCONFIG_LIBS_PRIVATE%" "${PKGCONFIG_LIBS_PRIVATE}"
|
|
|
583
|
+ FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
|
|
|
584
|
+ else ()
|
|
|
585
|
+ string(REPLACE "%PKGCONFIG_REQUIRES%" "${PKGCONFIG_REQUIRES} ${PKGCONFIG_REQUIRES_PRIVATE}"
|
|
|
586
|
+ FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
|
|
|
587
|
+ string(REPLACE "%PKGCONFIG_REQUIRES_PRIVATE%" ""
|
|
|
588
|
+ FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
|
|
|
589
|
+ string(REPLACE "%PKGCONFIG_LIBS%" "${PKGCONFIG_LIBS} ${PKGCONFIG_LIBS_PRIVATE}"
|
|
|
590
|
+ FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
|
|
|
591
|
+ string(REPLACE "%PKGCONFIG_LIBS_PRIVATE%" ""
|
|
|
592
|
+ FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
|
|
|
593
|
+ endif ()
|
|
576
|
594
|
|
|
577
|
595
|
set(FREETYPE2_PC_IN_NAME "${PROJECT_BINARY_DIR}/freetype2.pc")
|
|
578
|
596
|
if (EXISTS "${FREETYPE2_PC_IN_NAME}")
|