3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-08-22 06:35:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't add / to start of pkg-config file path when DESTDIR is unset

Browse Source 
This broke installation on Windows, because the suddenly started
with a '/' instead of a drive letter.

Closes #3019
This commit is contained in:
Martin Hořeňovský
2025-08-21 20:55:27 +02:00
parent 3e82ef9317
commit 78a9518a28
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@@ -195,17 +195,23 @@ if(NOT_SUBPROJECT)
"set(include_dir \"${CMAKE_INSTALL_INCLUDEDIR}\")" "set(include_dir \"${CMAKE_INSTALL_INCLUDEDIR}\")"
"set(lib_dir \"${CMAKE_INSTALL_LIBDIR}\")" "set(lib_dir \"${CMAKE_INSTALL_LIBDIR}\")"
[[ [[
message(STATUS "DESTDIR: $ENV{DESTDIR}")
set(DESTDIR_PREFIX "")
if (DEFINED ENV{DESTDIR})
set(DESTDIR_PREFIX "$ENV{DESTDIR}")
endif ()
message(STATUS "PREFIX: ${DESTDIR_PREFIX}")
set(lib_name "$<TARGET_FILE_BASE_NAME:Catch2>") set(lib_name "$<TARGET_FILE_BASE_NAME:Catch2>")
configure_file( configure_file(
"${impl_pc_file}" "${impl_pc_file}"
"$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${install_pkgconfdir}/catch2.pc" "${DESTDIR_PREFIX}${CMAKE_INSTALL_PREFIX}/${install_pkgconfdir}/catch2.pc"
@ONLY @ONLY
) )
set(lib_name "$<TARGET_FILE_BASE_NAME:Catch2WithMain>") set(lib_name "$<TARGET_FILE_BASE_NAME:Catch2WithMain>")
configure_file( configure_file(
"${main_pc_file}" "${main_pc_file}"
"$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${install_pkgconfdir}/catch2-with-main.pc" "${DESTDIR_PREFIX}${CMAKE_INSTALL_PREFIX}/${install_pkgconfdir}/catch2-with-main.pc"
@ONLY @ONLY
) )
]] ]]