diff options
| author | Brent Cook <busterb@gmail.com> | 2026-02-07 17:36:14 -0600 |
|---|---|---|
| committer | Brent Cook <busterb@gmail.com> | 2026-02-07 17:36:14 -0600 |
| commit | d849e4b504c81011b0f84ad5553ec309b998b8f4 (patch) | |
| tree | 07f7127c92a4a8c166ab8d267872af396537d689 | |
| parent | 362f7bd7a27fdfa84fdf12e360ac9e282fd4639c (diff) | |
| parent | 934688c728300341f0f929587bc6393a6eddfcf5 (diff) | |
| download | portable-d849e4b504c81011b0f84ad5553ec309b998b8f4.tar.gz portable-d849e4b504c81011b0f84ad5553ec309b998b8f4.tar.bz2 portable-d849e4b504c81011b0f84ad5553ec309b998b8f4.zip | |
Land #1206, don't modify CMAKE_INSTALL_*DIR variables if specified as absolute paths
| -rw-r--r-- | CMakeLists.txt | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 503ace3..1fc845c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -572,8 +572,16 @@ if(ENABLE_LIBRESSL_INSTALL) | |||
| 572 | # Create pkgconfig files. | 572 | # Create pkgconfig files. |
| 573 | set(prefix ${CMAKE_INSTALL_PREFIX}) | 573 | set(prefix ${CMAKE_INSTALL_PREFIX}) |
| 574 | set(exec_prefix \${prefix}) | 574 | set(exec_prefix \${prefix}) |
| 575 | set(libdir \${exec_prefix}/${CMAKE_INSTALL_LIBDIR}) | 575 | if(IS_ABSOLUTE ${CMAKE_INSTALL_LIBDIR}) |
| 576 | set(includedir \${prefix}/${CMAKE_INSTALL_INCLUDEDIR}) | 576 | set(libdir ${CMAKE_INSTALL_LIBDIR}) |
| 577 | else() | ||
| 578 | set(libdir \${exec_prefix}/${CMAKE_INSTALL_LIBDIR}) | ||
| 579 | endif() | ||
| 580 | if(IS_ABSOLUTE ${CMAKE_INSTALL_INCLUDEDIR}) | ||
| 581 | set(includedir ${CMAKE_INSTALL_INCLUDEDIR}) | ||
| 582 | else() | ||
| 583 | set(includedir \${prefix}/${CMAKE_INSTALL_INCLUDEDIR}) | ||
| 584 | endif() | ||
| 577 | if(PLATFORM_LIBS) | 585 | if(PLATFORM_LIBS) |
| 578 | string(REGEX REPLACE ";" " -l" PLATFORM_LDADD ";${PLATFORM_LIBS}") | 586 | string(REGEX REPLACE ";" " -l" PLATFORM_LDADD ";${PLATFORM_LIBS}") |
| 579 | endif() | 587 | endif() |
