Skip to content

Commit 1598057

Browse files
committed
Removing dependency on pkg-config from binary rpm
Set policy CMP0054 to NEW
1 parent 77102f7 commit 1598057

File tree

1 file changed

+15
-2
lines changed

1 file changed

+15
-2
lines changed

CMakeLists.txt

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
CMAKE_POLICY(SET CMP0048 NEW)
2121
#CMAKE_POLICY(SET CMP0057 NEW)
22+
CMAKE_POLICY(SET CMP0054 NEW)
2223

2324
PROJECT(mariadb_connector_odbc C)
2425

@@ -502,6 +503,8 @@ ELSE()
502503
ELSE()
503504
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libmaodbc.pc.in
504505
${CMAKE_CURRENT_BINARY_DIR}/libmaodbc.pc @ONLY)
506+
# RPM adds dependency on pkg-config, that we do not want. With later versions of cmake looks like we can deal with that
507+
MESSAGE(STATUS "Configuring to install libmaodbc.pc")
505508
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libmaodbc.pc
506509
DESTINATION "${INSTALL_PCDIR}"
507510
COMPONENT Development)
@@ -518,10 +521,20 @@ ELSE()
518521
${CMAKE_BINARY_DIR}/packaging/linux/postinstall @ONLY)
519522

520523
IF(RPM)
524+
SET(CPACK_RPM_POST_INSTALL_SCRIPT_FILE ${CMAKE_BINARY_DIR}/packaging/linux/postinstall)
525+
SET(CPACK_RPM_SPEC_MORE_DEFINE "
526+
%define __requires_exclude .*pkg-config
527+
")
521528
SET(CPACK_RPM_Development_USER_FILELIST "%ignore ${CMAKE_INSTALL_PREFIX}/${INSTALL_PCDIR}")
529+
# I guess this line works, and the previous does not. Keeping both as I am not sure
522530
SET(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION ${CMAKE_INSTALL_PREFIX}/${INSTALL_PCDIR})
523-
MESSAGE(STATUS "Excluding ${CMAKE_INSTALL_PREFIX}/${INSTALL_PCDIR} from RPM filelist")
524-
SET(CPACK_RPM_POST_INSTALL_SCRIPT_FILE ${CMAKE_BINARY_DIR}/packaging/linux/postinstall)
531+
532+
IF(CMAKE_VERSION VERSION_GREATER "3.21.99")
533+
MESSAGE(STATUS "Excluding ${CMAKE_INSTALL_PREFIX}/${INSTALL_PCDIR} from RPM filelist")
534+
SET(CPACK_RPM_REQUIRES_EXCLUDE_FROM ".*pkg-config")
535+
536+
MESSAGE(STATUS "Excluding pkg-config from RPM dependencies")
537+
ENDIF()
525538

526539
IF(CMAKE_VERSION VERSION_GREATER "3.9.99")
527540

0 commit comments

Comments
 (0)