-instead of simply removing KDE4_AUTOMOC(), it is better to make it just do message(SEND_ERROR), so the user gets

a useful error message instead of suddenly "unknown command"
-same for KDE4_INSTALL_LIBTOOL_FILE()
-also remove the docs for both macros from FindKDE4Internal.cmake

Alex


svn path=/trunk/KDE/kdelibs/; revision=686696

2 files changed, 8 insertions, 41 deletions

diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake
index 3cfcecfd..96bbc66d 100644
--- a/modules/FindKDE4Internal.cmake
+++ b/modules/FindKDE4Internal.cmake
@@ -127,21 +127,6 @@
 #    Use this to add widget description files for the makekdewidgets code generator
 #    for Qt Designer plugins.
 #
-# KDE4_AUTOMOC(file1 ... fileN)
-#    Call this if you want to have automatic moc file handling.
-#    This means if you include "foo.moc" in the source file foo.cpp
-#    a moc file for the header foo.h will be created automatically.
-#    You can set the property SKIP_AUTOMAKE using SET_SOURCE_FILES_PROPERTIES()
-#    to exclude some files in the list from being processed.
-#    If you don't want automoc, you can also use QT4_WRAP_CPP() or QT4_GENERATE_MOC()
-#    from FindQt4.cmake to have the moc files generated. This will be faster
-#    but require more manual work.
-#
-# KDE4_INSTALL_LIBTOOL_FILE ( subdir target )
-#    This will create and install a simple libtool file for the
-#    given target. This might be required for other software.
-#    The libtool file will be install in subdir, relative to CMAKE_INSTALL_PREFIX .
-#
 # KDE4_CREATE_FINAL_FILES (filename_CXX filename_C file1 ... fileN)
 #    This macro is intended mainly for internal uses.
 #    It is used for enable-final. It will generate two source files,
diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake
index 50ef3591..606f8a9e 100644
--- a/modules/KDE4Macros.cmake
+++ b/modules/KDE4Macros.cmake
@@ -8,7 +8,6 @@
 # KDE4_GET_CUSTOM_TARGET_PROPERTY
 # KDE4_MOC_HEADERS
 # KDE4_HANDLE_AUTOMOC
-# KDE4_INSTALL_LIBTOOL_FILE
 # KDE4_CREATE_FINAL_FILES
 # KDE4_ADD_KDEINIT_EXECUTABLE
 # KDE4_ADD_UNIT_TEST
@@ -151,16 +150,22 @@ macro (KDE4_ADD_UI3_FILES _sources )
    endforeach (_current_FILE)
 endmacro (KDE4_ADD_UI3_FILES)
 
+macro (KDE4_AUTOMOC)
+   message(SEND_ERROR "KDE4_AUTOMOC() is not required anymore for automoc, please remove it")
+endmacro (KDE4_AUTOMOC)
+
 macro (KDE4_SET_CUSTOM_TARGET_PROPERTY _target_name _property_name _property)
    string(REPLACE "[/ ]" "_" _dir "${CMAKE_CURRENT_SOURCE_DIR}")
    set(_kde4_${_dir}_${_target_name}_${_property_name} "${_property}")
 endmacro (KDE4_SET_CUSTOM_TARGET_PROPERTY)
 
+
 macro (KDE4_GET_CUSTOM_TARGET_PROPERTY _var _target_name _property_name)
    string(REPLACE "[/ ]" "_" _dir "${CMAKE_CURRENT_SOURCE_DIR}")
    set(${_var} "${_kde4_${_dir}_${_target_name}_${_property_name}}")
 endmacro (KDE4_GET_CUSTOM_TARGET_PROPERTY)
 
+
 macro (KDE4_MOC_HEADERS _target_NAME)
    set (_headers_to_moc)
    foreach (_current_FILE ${ARGN})
@@ -482,31 +487,8 @@ macro (KDE4_INSTALL_ICONS _defaultpath )
 endmacro (KDE4_INSTALL_ICONS)
 
 
-MACRO (KDE4_INSTALL_LIBTOOL_FILE _subdir _target)
-   GET_TARGET_PROPERTY(_target_location ${_target} LOCATION)
-
-   GET_FILENAME_COMPONENT(_laname ${_target_location} NAME_WE)
-   GET_FILENAME_COMPONENT(_soname ${_target_location} NAME)
-   set(_laname ${LIBRARY_OUTPUT_PATH}/${_laname}.la)
-
-   FILE(WRITE ${_laname} "# ${_laname} - a libtool library file, generated by cmake \n")
-   FILE(APPEND ${_laname} "# The name that we can dlopen(3).\n")
-   FILE(APPEND ${_laname} "dlname='${_soname}'\n")
-   FILE(APPEND ${_laname} "# Names of this library\n")
-   FILE(APPEND ${_laname} "library_names='${_soname} ${_soname} ${_soname}'\n")
-   FILE(APPEND ${_laname} "# The name of the static archive\n")
-   FILE(APPEND ${_laname} "old_library=''\n")
-   FILE(APPEND ${_laname} "# Libraries that this one depends upon.\n")
-   FILE(APPEND ${_laname} "dependency_libs=''\n")
-#   FILE(APPEND ${_laname} "dependency_libs='${${_target}_LIB_DEPENDS}'\n")
-   FILE(APPEND ${_laname} "# Version information.\ncurrent=0\nage=0\nrevision=0\n")
-   FILE(APPEND ${_laname} "# Is this an already installed library?\ninstalled=yes\n")
-   FILE(APPEND ${_laname} "# Should we warn about portability when linking against -modules?\nshouldnotlink=yes\n")
-   FILE(APPEND ${_laname} "# Files to dlopen/dlpreopen\ndlopen=''\ndlpreopen=''\n")
-   FILE(APPEND ${_laname} "# Directory that this library needs to be installed in:\n")
-   FILE(APPEND ${_laname} "libdir='${CMAKE_INSTALL_PREFIX}/${_subdir}'\n")
-
-   INSTALL(FILES ${_laname} DESTINATION ${_subdir})
+MACRO (KDE4_INSTALL_LIBTOOL_FILE)
+   message(SEND_ERROR "KDE4_INSTALL_LIBTOOL_FILE() is deprecated, please remove it")
 ENDMACRO (KDE4_INSTALL_LIBTOOL_FILE)