diff options
| author | Allen Winter <allen.winter@kdab.com> | 2021-09-26 13:06:47 -0400 |
|---|---|---|
| committer | Allen Winter <allen.winter@kdab.com> | 2021-09-26 13:06:47 -0400 |
| commit | 6380d31a022333893e60c1d49306d9ab35e84851 (patch) | |
| tree | e8ca6cc375c173909277e37efc19afba7e1291a6 | |
| parent | 09c002979ad3ec323bcffe3d7c886b9f5d6f3ba1 (diff) | |
| parent | e840bbb08cc651a44044a8abc36935ca9d7a4fd4 (diff) | |
| download | libical-git-6380d31a022333893e60c1d49306d9ab35e84851.tar.gz | |
Merge branch '3.0'
| -rw-r--r-- | CMakeLists.txt | 12 | ||||
| -rw-r--r-- | ReleaseNotes.txt | 1 | ||||
| -rw-r--r-- | src/libical-glib/CMakeLists.txt | 12 |
3 files changed, 21 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2179258b..284d6603 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -634,8 +634,16 @@ endif() set(VERSION "${LIBICAL_LIB_VERSION_STRING}") set(prefix "${CMAKE_INSTALL_PREFIX}") set(exec_prefix "\${prefix}") -set(libdir "\${exec_prefix}/lib") -set(includedir "\${prefix}/include") +if(IS_ABSOLUTE ${LIB_INSTALL_DIR}) + set(libdir "${LIB_INSTALL_DIR}") +else() + set(libdir "\${exec_prefix}/${LIB_INSTALL_DIR}") +endif() +if(IS_ABSOLUTE ${INCLUDE_INSTALL_DIR}) + set(includedir "${INCLUDE_INSTALL_DIR}") +else() + set(includedir "\${prefix}/include") +endif() set(PTHREAD_LIBS "${CMAKE_THREAD_LIBS_INIT}") configure_file( diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 3cb5df40..704d80bb 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -47,6 +47,7 @@ Version 3.0.11 (UNRELEASED): * Fix vcal for some architectures (like aarch64, ppc64le and s390x) * Fix memory leaks in vcal * Prevent crash when looking for tzid in initialize_rscale + * Adjust libdir and includedir in generated pkgconfig files Version 3.0.10 (17 April 2021): ------------------------------- diff --git a/src/libical-glib/CMakeLists.txt b/src/libical-glib/CMakeLists.txt index 096f9bb4..f734024e 100644 --- a/src/libical-glib/CMakeLists.txt +++ b/src/libical-glib/CMakeLists.txt @@ -257,8 +257,16 @@ install(FILES ${LIBICAL_GLIB_HEADERS} set(prefix "${CMAKE_INSTALL_PREFIX}") set(exec_prefix "\${prefix}") -set(libdir "\${exec_prefix}/lib") -set(includedir "\${prefix}/include") +if(IS_ABSOLUTE ${LIB_INSTALL_DIR}) + set(libdir "${LIB_INSTALL_DIR}") +else() + set(libdir "\${exec_prefix}/${LIB_INSTALL_DIR}") +endif() +if(IS_ABSOLUTE ${INCLUDE_INSTALL_DIR}) + set(includedir "${INCLUDE_INSTALL_DIR}") +else() + set(includedir "\${prefix}/include") +endif() configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/libical-glib.pc.in |