Skip to content

Commit 943479a

Browse files
Merge #1694: Revert "cmake: configure libsecp256k1.pc during install"
44b205e Revert "cmake: configure libsecp256k1.pc during install" (Daniel Pfeifer) Pull request description: This reverts commit 7106dce. This causes a regression for packaging, as the generated `.pc` file will contain the location that was used to build the package archive. ACKs for top commit: real-or-random: ACK 44b205e Tree-SHA512: f4331c23534260bc21e69ccff65abad766e6a51aaba350c40674e32b3200768ca3c6742671e425aa8fcb681deb430cd6b3e20f34b9e8f8ab909371cf5e8976c5
2 parents ad60ef7 + 44b205e commit 943479a

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

cmake/GeneratePkgConfigFile.cmake

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
function(generate_pkg_config_file in_file)
2-
set(prefix "@CMAKE_INSTALL_PREFIX@")
2+
set(prefix ${CMAKE_INSTALL_PREFIX})
33
set(exec_prefix \${prefix})
44
set(libdir \${exec_prefix}/${CMAKE_INSTALL_LIBDIR})
55
set(includedir \${prefix}/${CMAKE_INSTALL_INCLUDEDIR})
66
set(PACKAGE_VERSION ${PROJECT_VERSION})
7-
configure_file(${in_file} ${PROJECT_NAME}.pc.in @ONLY)
8-
install(CODE "configure_file(
9-
\"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc.in\"
10-
\"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc\"
11-
@ONLY)" ALL_COMPONENTS)
7+
configure_file(${in_file} ${PROJECT_NAME}.pc @ONLY)
128
endfunction()

0 commit comments

Comments
 (0)