diff options
| -rw-r--r-- | modules/FindKDE4Internal.cmake | 2 | ||||
| -rw-r--r-- | modules/KDE4Defaults.cmake | 11 | ||||
| -rw-r--r-- | modules/KDE4Macros.cmake | 17 |
3 files changed, 21 insertions, 9 deletions
diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index 83e53d9c..372e4ee2 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -678,5 +678,3 @@ set(KDE4_INCLUDES ${QT_INCLUDES} ${KDE4_INCLUDE_DIR} ${_KDE4_PLATFORM_INCLUDE_DI # 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 ) -# always add CMAKE_CCURRENT_SOURCE_DIR and CMAKE_CURRENT_BINARY_DIR to the include path to save some typing, Alex -set(CMAKE_INCLUDE_CURRENT_DIR TRUE) diff --git a/modules/KDE4Defaults.cmake b/modules/KDE4Defaults.cmake new file mode 100644 index 00000000..d019258d --- /dev/null +++ b/modules/KDE4Defaults.cmake @@ -0,0 +1,11 @@ + +# support for Dart: http://public.kitware.com/dashboard.php?name=kde +enable_testing() +include(CTest) + +# Always include srcdir and builddir in include path +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +# Use colors +set(CMAKE_COLOR_MAKEFILE ON) + diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index fd60354e..e9d36fd4 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -457,19 +457,20 @@ MACRO (KDE4_ADD_EXECUTABLE _target_NAME _first_ARG) if (APPLE) # set(_add_executable_param MACOSX_BUNDLE) endif (APPLE) - if (WIN32) +# should this be enabled on windows ? Alex +# if (WIN32) # set(_add_executable_param WIN32) - endif (WIN32) +# endif (WIN32) if (${_first_ARG} STREQUAL "NOGUI") set(_type "NOGUI") set(_first_SRC) endif (${_first_ARG} STREQUAL "NOGUI") - if (${_first_ARG} STREQUAL "BUILDTOOL") - set(_type "BUILDTOOL") + if (${_first_ARG} STREQUAL "TOOL") + set(_type "TOOL") set(_first_SRC) - endif (${_first_ARG} STREQUAL "BUILDTOOL") + endif (${_first_ARG} STREQUAL "TOOL") if (KDE4_ENABLE_FINAL) kde4_create_final_files(${_target_NAME}_final_cpp.cpp ${_target_NAME}_final_c.c ${_first_SRC} ${ARGN}) @@ -481,11 +482,13 @@ MACRO (KDE4_ADD_EXECUTABLE _target_NAME _first_ARG) # and now the RPATH handling... if (${_type} STREQUAL "GUI") endif (${_type} STREQUAL "GUI") + if (${_type} STREQUAL "NOGUI") endif (${_type} STREQUAL "NOGUI") - if (${_type} STREQUAL "BUILDTOOL") + + if (${_type} STREQUAL "TOOL") # set_target_properties(${_target_NAME} SKIP_BUILD_RPATH FALSE BUILD_WITH_INSTALL_RPATH FALSE) - endif (${_type} STREQUAL "BUILDTOOL") + endif (${_type} STREQUAL "TOOL") kde4_handle_rpath(${_target_NAME}) |