[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace
From:       Thiago Macieira <thiago () kde ! org>
Date:       2011-01-14 14:26:03
Message-ID: 20110114142603.677B0AC8B3 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1214398 by thiago:

Stop versioning the CMake config files.

It makes no sense to have more than one set of files. You can't
install two sets of header files anyway. So the CMake config files
must match the headers that are installed at this prefix.

CMake has the nasty habit of finding alphebetically, so it finds the
oldest config, not the newest. If you keep old files lying around
(such as building from source and never rm -rf), eventually you'll get
compiler or linker errors due to the mismatch of headers and libs.

 M  +2 -2      CMakeLists.txt  


--- trunk/KDE/kdebase/workspace/CMakeLists.txt #1214397:1214398
@@ -223,13 +223,13 @@
 macro_write_basic_cmake_version_file(${CMAKE_CURRENT_BINARY_DIR}/KDE4WorkspaceConfigVersion.cmake \
                
                                      ${KDE4WORKSPACE_VERSION_MAJOR} \
${KDE4WORKSPACE_VERSION_MINOR} ${KDE4WORKSPACE_VERSION_PATCH})  
-set(_KDE4WorkspaceConfig_INSTALL_DIR \
${LIB_INSTALL_DIR}/KDE4Workspace-${KDE4WORKSPACE_VERSION}/cmake) \
+set(_KDE4WorkspaceConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/KDE4Workspace/cmake)  # \
places where find_package() looks for FooConfig.cmake files:  # CMake >= 2.6.0 looks \
in lib/Foo*/cmake/, CMake >= 2.6.3 also looks in  # lib/cmake/Foo*/, which packagers \
prefer. So they can set the KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR  # option to \
have kdepimlibs install its Config file there. Alex  \
                if(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
-   set(_KDE4WorkspaceConfig_INSTALL_DIR \
${LIB_INSTALL_DIR}/cmake/KDE4Workspace-${KDE4WORKSPACE_VERSION} ) +   \
set(_KDE4WorkspaceConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/KDE4Workspace)  \
endif(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)  
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/KDE4WorkspaceConfig.cmake


[prev in list] [next in list] [prev in thread] [next in thread]