diff options
Diffstat (limited to 'kde-modules')
| -rw-r--r-- | kde-modules/KDECompilerSettings.cmake | 22 | ||||
| -rw-r--r-- | kde-modules/KDEInstallDirs.cmake | 6 |
2 files changed, 13 insertions, 15 deletions
diff --git a/kde-modules/KDECompilerSettings.cmake b/kde-modules/KDECompilerSettings.cmake index ac21cf74..03344e48 100644 --- a/kde-modules/KDECompilerSettings.cmake +++ b/kde-modules/KDECompilerSettings.cmake @@ -356,24 +356,16 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") set( __KDE_HAVE_GCC_VISIBILITY ${__KDE_HAVE_GCC_VISIBILITY} CACHE BOOL "GCC support for hidden visibility") # CMAKE_CXX_COMPILER_VERSION exists since cmake 2.8.7.20120217 - if(NOT CMAKE_CXX_COMPILER_VERSION) - message(STATUS "************** Your CMake is old. Better update to git master.") + if(NOT "${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS "4.1.0") set(GCC_IS_NEWER_THAN_4_1 TRUE) - set(GCC_IS_NEWER_THAN_4_2 TRUE) - set(GCC_IS_NEWER_THAN_4_3 TRUE) - else() - - if(NOT "${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS "4.1.0") - set(GCC_IS_NEWER_THAN_4_1 TRUE) - endif() + endif() - if(NOT "${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS "4.2.0") - set(GCC_IS_NEWER_THAN_4_2 TRUE) - endif() + if(NOT "${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS "4.2.0") + set(GCC_IS_NEWER_THAN_4_2 TRUE) + endif() - if(NOT "${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS "4.3.0") - set(GCC_IS_NEWER_THAN_4_3 TRUE) - endif() + if(NOT "${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS "4.3.0") + set(GCC_IS_NEWER_THAN_4_3 TRUE) endif() # save a little by making local statics not threadsafe diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake index a9d738c7..ea132e6e 100644 --- a/kde-modules/KDEInstallDirs.cmake +++ b/kde-modules/KDEInstallDirs.cmake @@ -179,3 +179,9 @@ if(APPLE) set(INSTALL_TARGETS_DEFAULT_ARGS ${INSTALL_TARGETS_DEFAULT_ARGS} BUNDLE DESTINATION "${BUNDLE_INSTALL_DIR}" ) endif(APPLE) + +# new in cmake 2.8.9: this is used for all installed files which do not have a component set +# so set the default component name to the name of the project, if a project name has been set: +if(NOT "${PROJECT_NAME}" STREQUAL "Project") + set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME "${PROJECT_NAME}") +endif() |