diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2008-11-10 23:52:13 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2008-11-10 23:52:13 +0000 |
| commit | 57d92979d017bcc1748f29e942b5843428e30051 (patch) | |
| tree | c274b20c35aa77bf604ac19e36b65de4afd0d5ab /modules/CMakeLists.txt | |
| parent | 114be0522e85d5c34fe48a1b9d56afc99e15e83b (diff) | |
| download | extra-cmake-modules-57d92979d017bcc1748f29e942b5843428e30051.tar.gz extra-cmake-modules-57d92979d017bcc1748f29e942b5843428e30051.tar.bz2 | |
-require cmake 2.6.2
-enable the reduced link interface for everybody now in kdelibs
-convert all the set_target_properties(foo LINK_INTERFACE_LIBRARIES...)
to the new target_link_libraries(foo LINK_INTERFACE_LIBRARIES ...)
-install all shared libs also as "exported targets", so these libraries
can be included by the other projects again as "imported targets", which
should fix some problems with different build configurations, the reduced
link interface, hopefully also custom install locations (Windows), maybe more
-remove the temporary internal hackish macro _KDE4_EXPORT_LIBRARY_DEPENDENCIES()
Alex, who hopes this doesn't break too much...
So if you get linker errors now, please let me know (or even better kde-buildsystem@kde.org)
svn path=/trunk/KDE/kdelibs/; revision=882594
Diffstat (limited to 'modules/CMakeLists.txt')
| -rw-r--r-- | modules/CMakeLists.txt | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt index f9b305db..af84391d 100644 --- a/modules/CMakeLists.txt +++ b/modules/CMakeLists.txt @@ -12,13 +12,6 @@ install( FILES cmake-modules-styleguide.txt kde4init_dummy.cpp.in kde4init_win32 #set(FILES_TO_REMOVE #) -# can be removed once we require merge into cmake -# FindLibXslt.cmake -# FindOpenSSL.cmake - -# can be removed once we require cmake 2.4.6 or newer: -# FindPkgConfig.cmake - #install(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/remove_files.cmake ) #file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/remove_files.cmake "#generated by cmake, dont edit\n\n") @@ -27,9 +20,6 @@ install( FILES cmake-modules-styleguide.txt kde4init_dummy.cpp.in kde4init_win32 # file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/remove_files.cmake "exec_program( ${CMAKE_COMMAND} ARGS -E remove ${_current_FILE} OUTPUT_VARIABLE _dummy)\n" ) #endforeach ( _current_FILE) -# with cmake 2.6 and above create and install a man page for the kdelibs cmake modules -# (cmake 2.4 doesn't support creating documentation for cmake modules in custom directories) -if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER "2.5") - add_custom_target(KDECMakeModulesManPage ALL COMMAND ${CMAKE_COMMAND} -DCMAKE_MODULE_PATH=${CMAKE_CURRENT_SOURCE_DIR} --help-custom-modules ${CMAKE_CURRENT_BINARY_DIR}/kdecmake.1) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kdecmake.1 DESTINATION "${MAN_INSTALL_DIR}/man1") -endif("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER "2.5") +# create and install a man page for the kdelibs cmake modules +add_custom_target(KDECMakeModulesManPage ALL COMMAND ${CMAKE_COMMAND} -DCMAKE_MODULE_PATH=${CMAKE_CURRENT_SOURCE_DIR} --help-custom-modules ${CMAKE_CURRENT_BINARY_DIR}/kdecmake.1) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kdecmake.1 DESTINATION "${MAN_INSTALL_DIR}/man1") |