On Tuesday 01 August 2006 20:22, David Faure wrote:
Hi,
What do you think about this patch ?
I readd as for old build system a libsuffix
Regards
> On Monday 31 July 2006 09:41, Laurent Montel wrote:
> > SVN commit 568125 by mlaurent:
> >
> > Fix pb when we relauch ccmake -D... ../
> > LIB_* variable was not changed
> >
> >
> > M +1 -1 FindKDE4Internal.cmake
> >
> >
> > --- trunk/KDE/kdelibs/cmake/modules/FindKDE4Internal.cmake #568124:568125
> > @@ -197,7 +197,7 @@
> > ## the following are directories where stuff will be installed to
> > set(BIN_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/bin"
> > CACHE PATH "The kde info install dir (default prefix/info)" FORCE)
> > set(SBIN_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/sbin"
> > CACHE PATH "The kde info install dir (default prefix/info)" FORCE) -
> > set(LIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/lib"
> > CACHE PATH "The subdirectory relative to the install prefix where
> > libraries will be installed (default is /lib)") + set(LIB_INSTALL_DIR
> > "${EXEC_INSTALL_PREFIX}/lib" CACHE PATH "The
> > subdirectory relative to the install prefix where libraries will be
> > installed (default is /lib)" FORCE)
>
> Ohoh, this reverts an earlier commit. The FORCE broke for people using
> /lib64 iirc; check svn logs.
Index: FindKDE4Internal.cmake
===================================================================
--- FindKDE4Internal.cmake (revision 568750)
+++ FindKDE4Internal.cmake (working copy)
@@ -190,15 +190,15 @@
#add some KDE specific stuff
-
+set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" FORCE)
set(SHARE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}/share CACHE PATH "Base directory for files which go to share/" FORCE)
set(EXEC_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Base directory for executables and libraries" FORCE)
#
## the following are directories where stuff will be installed to
set(BIN_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/bin" CACHE PATH "The kde info install dir (default prefix/info)" FORCE)
set(SBIN_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/sbin" CACHE PATH "The kde info install dir (default prefix/info)" FORCE)
- set(LIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/lib" CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib)" FORCE)
- set(LIBEXEC_INSTALL_DIR "${LIB_INSTALL_DIR}/kde4/libexec" CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib)" FORCE)
+ set(LIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib${LIB_SUFFIX})" FORCE)
+ set(LIBEXEC_INSTALL_DIR "${LIB_INSTALL_DIR}/kde4/libexec" CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib/kde4/libexec)" FORCE)
set(PLUGIN_INSTALL_DIR "${LIB_INSTALL_DIR}/kde4" CACHE PATH "The subdirectory relative to the install prefix where plugins will be installed (default is ${KDE4_LIB_INSTALL_DIR}/kde4)" FORCE)
set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "The subdirectory to the header prefix" FORCE)
set(CONFIG_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/config" CACHE PATH "The config file install dir" FORCE)
@@ -717,7 +717,7 @@
# NOT used in Qt4: QT_NO_COMPAT, QT_CLEAN_NAMESPACE, QT_THREAD_SUPPORT
set(KDE4_DEFINITIONS ${_KDE4_PLATFORM_DEFINITIONS} -DQT3_SUPPORT -DQT_NO_STL -DQT_NO_CAST_TO_ASCII -D_REENTRANT -DQT3_SUPPORT_WARNINGS -DKDE_DEPRECATED_WARNINGS )
-string(REGEX REPLACE ".*/lib" "" KDELIBSUFF ${LIB_INSTALL_DIR} )
+set( KDELIBSUFF ${LIB_SUFFIX} )
if (NOT _kde4_uninstall_rule_created)
_______________________________________________
Kde-buildsystem mailing list
[email protected]
https://mail.kde.org/mailman/listinfo/kde-buildsystem
