1
2
3
4
5
6
7
8
9
10
11
12
13
14
|
From: Bastian Germann <bage@debian.org>
Subject: Prevent overriding CMAKE_INSTALL_LIBDIR
---
--- a/cmake/c4Project.cmake
+++ b/cmake/c4Project.cmake
@@ -2787,7 +2787,7 @@ endfunction()
macro(_c4_setup_install_vars)
set(_RUNTIME_INSTALL_DIR bin/)
set(_ARCHIVE_INSTALL_DIR lib/)
- set(_LIBRARY_INSTALL_DIR lib/) # TODO on Windows, ARCHIVE and LIBRARY dirs must be different to prevent name clashes
+ set(_LIBRARY_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}) # TODO on Windows, ARCHIVE and LIBRARY dirs must be different to prevent name clashes
set(_INCLUDE_INSTALL_DIR include/)
set(_OBJECTS_INSTALL_DIR obj/)
set(_SYSCONFIG_INSTALL_DIR etc/${_c4_lcprefix}/)
|
