55 lines
2.6 KiB
Diff
55 lines
2.6 KiB
Diff
|
From 6cd6b32af052563e4cd5114a1d279736d1d8653a Mon Sep 17 00:00:00 2001
|
||
|
|
From: "Matthias C. M. Troffaes" <matthias.troffaes@gmail.com>
|
||
|
|
Date: Tue, 1 Jun 2021 08:06:45 +0100
|
||
|
|
Subject: [PATCH] Use CMAKE_<CONFIG>_POSTFIX for .pc file lib suffix.
|
||
|
|
|
||
|
|
Signed-off-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>
|
||
|
|
---
|
||
|
|
IlmBase/config/CMakeLists.txt | 3 ++-
|
||
|
|
OpenEXR/config/CMakeLists.txt | 3 ++-
|
||
|
|
PyIlmBase/config/CMakeLists.txt | 3 ++-
|
||
|
|
3 files changed, 6 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/IlmBase/config/CMakeLists.txt b/IlmBase/config/CMakeLists.txt
|
||
|
|
index d9c5ae449..dfebb43bd 100644
|
||
|
|
--- a/IlmBase/config/CMakeLists.txt
|
||
|
|
+++ b/IlmBase/config/CMakeLists.txt
|
||
|
|
@@ -78,7 +78,8 @@ if(ILMBASE_INSTALL_PKG_CONFIG)
|
||
|
|
set(exec_prefix "\${prefix}")
|
||
|
|
set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}")
|
||
|
|
set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
|
||
|
|
- set(LIB_SUFFIX_DASH ${ILMBASE_LIB_SUFFIX})
|
||
|
|
+ string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)
|
||
|
|
+ set(LIB_SUFFIX_DASH ${ILMBASE_LIB_SUFFIX}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX})
|
||
|
|
if(TARGET Threads::Threads)
|
||
|
|
# hrm, can't use properties as they end up as generator expressions
|
||
|
|
# which don't seem to evaluate
|
||
|
|
diff --git a/OpenEXR/config/CMakeLists.txt b/OpenEXR/config/CMakeLists.txt
|
||
|
|
index 8386e3a0e..039190cd9 100644
|
||
|
|
--- a/OpenEXR/config/CMakeLists.txt
|
||
|
|
+++ b/OpenEXR/config/CMakeLists.txt
|
||
|
|
@@ -77,7 +77,8 @@ if(OPENEXR_INSTALL_PKG_CONFIG)
|
||
|
|
set(exec_prefix "\${prefix}")
|
||
|
|
set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}")
|
||
|
|
set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
|
||
|
|
- set(LIB_SUFFIX_DASH ${OPENEXR_LIB_SUFFIX})
|
||
|
|
+ string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)
|
||
|
|
+ set(LIB_SUFFIX_DASH ${OPENEXR_LIB_SUFFIX}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX})
|
||
|
|
if(TARGET Threads::Threads)
|
||
|
|
# hrm, can't use properties as they end up as generator expressions
|
||
|
|
# which don't seem to evaluate
|
||
|
|
diff --git a/PyIlmBase/config/CMakeLists.txt b/PyIlmBase/config/CMakeLists.txt
|
||
|
|
index 1872c89e7..a4139bcfd 100644
|
||
|
|
--- a/PyIlmBase/config/CMakeLists.txt
|
||
|
|
+++ b/PyIlmBase/config/CMakeLists.txt
|
||
|
|
@@ -18,7 +18,8 @@ if(PYILMBASE_INSTALL_PKG_CONFIG)
|
||
|
|
set(exec_prefix ${CMAKE_INSTALL_BINDIR})
|
||
|
|
set(libdir ${CMAKE_INSTALL_LIBDIR})
|
||
|
|
set(includedir ${CMAKE_INSTALL_INCLUDEDIR})
|
||
|
|
- set(LIB_SUFFIX_DASH ${OPENEXR_LIB_SUFFIX})
|
||
|
|
+ string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)
|
||
|
|
+ set(LIB_SUFFIX_DASH ${OPENEXR_LIB_SUFFIX}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX})
|
||
|
|
string(REPLACE ".in" "" pcout ${pcinfile})
|
||
|
|
configure_file(${pcinfile} ${CMAKE_CURRENT_BINARY_DIR}/${pcout} @ONLY)
|
||
|
|
install(
|