freetype-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Git][freetype/freetype][master] * CMakeLists.txt: Don't limit generatio


From: Werner Lemberg
Subject: [Git][freetype/freetype][master] * CMakeLists.txt: Don't limit generation of 'pkg-config' file to UNIX.
Date: Tue, 16 Mar 2021 07:37:55 +0000

Werner Lemberg pushed to branch master at FreeType / FreeType

Commits:

2 changed files:

Changes:

  • CMakeLists.txt
    ... ... @@ -495,41 +495,39 @@ endif ()
    495 495
     
    
    496 496
     if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL)
    
    497 497
       # Generate the pkg-config file
    
    498
    -  if (UNIX)
    
    499
    -    file(READ "${PROJECT_SOURCE_DIR}/builds/unix/freetype2.in" FREETYPE2_PC_IN)
    
    500
    -
    
    501
    -    string(REPLACE ";" ", " PKG_CONFIG_REQUIRED_PRIVATE "${PKG_CONFIG_REQUIRED_PRIVATE}")
    
    502
    -
    
    503
    -    string(REPLACE "%prefix%" ${CMAKE_INSTALL_PREFIX}
    
    504
    -           FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
    
    505
    -    string(REPLACE "%exec_prefix%" "\${prefix}"
    
    506
    -           FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
    
    507
    -    string(REPLACE "%libdir%" "\${prefix}/${CMAKE_INSTALL_LIBDIR}"
    
    508
    -           FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
    
    509
    -    string(REPLACE "%includedir%" "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}"
    
    510
    -           FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
    
    511
    -    string(REPLACE "%ft_version%" "${LIBTOOL_CURRENT}.${LIBTOOL_REVISION}.${LIBTOOL_AGE}"
    
    512
    -           FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
    
    513
    -    string(REPLACE "%REQUIRES_PRIVATE%" "${PKG_CONFIG_REQUIRED_PRIVATE}"
    
    514
    -           FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
    
    515
    -    string(REPLACE "%LIBS_PRIVATE%" "${PKG_CONFIG_LIBS_PRIVATE}"
    
    516
    -           FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
    
    517
    -
    
    518
    -    set(FREETYPE2_PC_IN_NAME "${PROJECT_BINARY_DIR}/freetype2.pc")
    
    519
    -    if (EXISTS "${FREETYPE2_PC_IN_NAME}")
    
    520
    -      file(READ "${FREETYPE2_PC_IN_NAME}" ORIGINAL_FREETYPE2_PC_IN)
    
    521
    -    else ()
    
    522
    -      set(ORIGINAL_FREETYPE2_PC_IN "")
    
    523
    -    endif ()
    
    524
    -    if (NOT (ORIGINAL_FREETYPE2_PC_IN STREQUAL FREETYPE2_PC_IN))
    
    525
    -      file(WRITE "${FREETYPE2_PC_IN_NAME}" ${FREETYPE2_PC_IN})
    
    526
    -    endif ()
    
    527
    -
    
    528
    -    install(
    
    529
    -      FILES ${PROJECT_BINARY_DIR}/freetype2.pc
    
    530
    -      DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
    
    531
    -      COMPONENT pkgconfig)
    
    498
    +  file(READ "${PROJECT_SOURCE_DIR}/builds/unix/freetype2.in" FREETYPE2_PC_IN)
    
    499
    +
    
    500
    +  string(REPLACE ";" ", " PKG_CONFIG_REQUIRED_PRIVATE "${PKG_CONFIG_REQUIRED_PRIVATE}")
    
    501
    +
    
    502
    +  string(REPLACE "%prefix%" ${CMAKE_INSTALL_PREFIX}
    
    503
    +          FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
    
    504
    +  string(REPLACE "%exec_prefix%" "\${prefix}"
    
    505
    +          FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
    
    506
    +  string(REPLACE "%libdir%" "\${prefix}/${CMAKE_INSTALL_LIBDIR}"
    
    507
    +          FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
    
    508
    +  string(REPLACE "%includedir%" "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}"
    
    509
    +          FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
    
    510
    +  string(REPLACE "%ft_version%" "${LIBTOOL_CURRENT}.${LIBTOOL_REVISION}.${LIBTOOL_AGE}"
    
    511
    +          FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
    
    512
    +  string(REPLACE "%REQUIRES_PRIVATE%" "${PKG_CONFIG_REQUIRED_PRIVATE}"
    
    513
    +          FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
    
    514
    +  string(REPLACE "%LIBS_PRIVATE%" "${PKG_CONFIG_LIBS_PRIVATE}"
    
    515
    +          FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
    
    516
    +
    
    517
    +  set(FREETYPE2_PC_IN_NAME "${PROJECT_BINARY_DIR}/freetype2.pc")
    
    518
    +  if (EXISTS "${FREETYPE2_PC_IN_NAME}")
    
    519
    +    file(READ "${FREETYPE2_PC_IN_NAME}" ORIGINAL_FREETYPE2_PC_IN)
    
    520
    +  else ()
    
    521
    +    set(ORIGINAL_FREETYPE2_PC_IN "")
    
    532 522
       endif ()
    
    523
    +  if (NOT (ORIGINAL_FREETYPE2_PC_IN STREQUAL FREETYPE2_PC_IN))
    
    524
    +    file(WRITE "${FREETYPE2_PC_IN_NAME}" ${FREETYPE2_PC_IN})
    
    525
    +  endif ()
    
    526
    +
    
    527
    +  install(
    
    528
    +    FILES ${PROJECT_BINARY_DIR}/freetype2.pc
    
    529
    +    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
    
    530
    +    COMPONENT pkgconfig)
    
    533 531
     
    
    534 532
       include(CMakePackageConfigHelpers)
    
    535 533
       write_basic_package_version_file(
    

  • ChangeLog
    1
    +2021-03-16  Christopher Degawa  <ccom@randomderp.com>
    
    2
    +
    
    3
    +	* CMakeLists.txt: Don't limit generation of 'pkg-config' file to UNIX.
    
    4
    +
    
    5
    +	mingw-w64 uses the 'pkg-config' files but does not set UNIX.
    
    6
    +
    
    1 7
     2021-03-11  Alexei Podtelezhnikov  <apodtele@gmail.com>
    
    2 8
     
    
    3 9
     	* src/smooth/ftgrays.c (gray_set_cell): Refactor to fix VC++ warning.
    


  • reply via email to

    [Prev in Thread] Current Thread [Next in Thread]