Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-24 10:52:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

generic: minor KDE4Macros cleanup and remove deprecated MacroKAuth CMake module

Browse source
This commit is contained in:
Ivailo Monev 2015-01-23 18:51:39 +00:00
parent 004e949a0f
commit f647d645c1
3 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cmake/modules/CMakeLists.txt
View file

@ -115,7 +115,6 @@ set(cmakeFiles
MacroBoolTo01.cmake MacroBoolTo01.cmake
MacroEnsureOutOfSourceBuild.cmake MacroEnsureOutOfSourceBuild.cmake
MacroEnsureVersion.cmake MacroEnsureVersion.cmake
MacroKAuth.cmake
MacroLibrary.cmake MacroLibrary.cmake
MacroLogFeature.cmake MacroLogFeature.cmake
MacroOptionalAddSubdirectory.cmake MacroOptionalAddSubdirectory.cmake

26
cmake/modules/KDE4Macros.cmake
View file

@ -720,7 +720,7 @@ macro (KDE4_ADD_UNIT_TEST _test_NAME)
set(_targetName ${ARGV2}) set(_targetName ${ARGV2})
list(REMOVE_AT _srcList 0 1) list(REMOVE_AT _srcList 0 1)
endif( ${ARGV1} STREQUAL "TESTNAME" ) endif( ${ARGV1} STREQUAL "TESTNAME" )
set(_nogui) set(_nogui)
list(GET _srcList 0 first_PARAM) list(GET _srcList 0 first_PARAM)
if( ${first_PARAM} STREQUAL "NOGUI" ) if( ${first_PARAM} STREQUAL "NOGUI" )
@ -756,17 +756,15 @@ macro (KDE4_ADD_UNIT_TEST _test_NAME)
# add_test( ${_targetName} ${EXECUTABLE_OUTPUT_PATH}/${_test_NAME} -xml -o ${_test_NAME}.tml ) # add_test( ${_targetName} ${EXECUTABLE_OUTPUT_PATH}/${_test_NAME} -xml -o ${_test_NAME}.tml )
if (NOT MSVC_IDE) #not needed for the ide # if the tests are EXCLUDE_FROM_ALL, add a target "buildtests" to build all tests
# if the tests are EXCLUDE_FROM_ALL, add a target "buildtests" to build all tests if (NOT KDE4_BUILD_TESTS)
if (NOT KDE4_BUILD_TESTS) get_directory_property(_buildtestsAdded BUILDTESTS_ADDED)
get_directory_property(_buildtestsAdded BUILDTESTS_ADDED) if(NOT _buildtestsAdded)
if(NOT _buildtestsAdded) add_custom_target(buildtests)
add_custom_target(buildtests) set_directory_properties(PROPERTIES BUILDTESTS_ADDED TRUE)
set_directory_properties(PROPERTIES BUILDTESTS_ADDED TRUE) endif(NOT _buildtestsAdded)
endif(NOT _buildtestsAdded) add_dependencies(buildtests ${_test_NAME})
add_dependencies(buildtests ${_test_NAME}) endif (NOT KDE4_BUILD_TESTS)
endif (NOT KDE4_BUILD_TESTS)
endif (NOT MSVC_IDE)
endmacro (KDE4_ADD_UNIT_TEST) endmacro (KDE4_ADD_UNIT_TEST)
@ -807,13 +805,13 @@ macro (_KDE4_ADD_MANIFEST _target_NAME)
else(${x}) else(${x})
get_target_property(_executable ${_target_NAME} LOCATION ) get_target_property(_executable ${_target_NAME} LOCATION )
endif(${x}) endif(${x})
if (_kdeBootStrapping) if (_kdeBootStrapping)
set(_cmake_module_path ${CMAKE_SOURCE_DIR}/cmake/modules) set(_cmake_module_path ${CMAKE_SOURCE_DIR}/cmake/modules)
else (_kdeBootStrapping) else (_kdeBootStrapping)
set(_cmake_module_path ${KDE4_INSTALL_DIR}/share/apps/cmake/modules) set(_cmake_module_path ${KDE4_INSTALL_DIR}/share/apps/cmake/modules)
endif (_kdeBootStrapping) endif (_kdeBootStrapping)
set(_manifest ${_cmake_module_path}/Win32.Manifest.in) set(_manifest ${_cmake_module_path}/Win32.Manifest.in)
#message(STATUS ${_executable} ${_manifest}) #message(STATUS ${_executable} ${_manifest})
add_custom_command( add_custom_command(

3
cmake/modules/MacroKAuth.cmake
View file

@ -1,3 +0,0 @@
message(FATAL_ERROR "Don't include(MacroKAuth) anymore, it's now included in find_package(KDE4). This file will be removed soon, and will not appear in KDE 4.4 release.")