Make sure to check for existance of ${CMAKE_SOURCE_DIR}/.tdescminfo

before trying to read it.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 4940b4ebe7)

CMakeLists.txt

@@ -0,0 +1,33 @@
+#################################################
+#
+#  (C) 2021 Slávek Banko
+#  slavek.banko (at) axis.cz
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+## Process only if it is built as a standalone package
+if( "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}" )
+
+##### general package setup #####################
+
+  cmake_minimum_required( VERSION 3.1 )
+  project( tde-cmake-rules )
+
+
+##### install TDE CMake files ###################
+
+  file( GLOB_RECURSE _modules
+        RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+        ${CMAKE_CURRENT_SOURCE_DIR}/modules/* )
+  install( FILES ${_modules} DESTINATION ${CMAKE_ROOT}/Modules )
+
+  file( GLOB_RECURSE _templates
+        RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+        ${CMAKE_CURRENT_SOURCE_DIR}/templates/* )
+  install( FILES ${_templates} DESTINATION ${CMAKE_ROOT}/Templates )
+
+endif()

modules/FindTDE.cmake

@@ -13,36 +13,44 @@ if( NOT TDE_FOUND )
 
   message( STATUS "checking for 'TDE'")
 
+  pkg_search_module( TDE tqt )
+
+  if( NOT TDE_FOUND )
+    tde_message_fatal( "Unable to find kdelibs!\n Try adding the directory in which the kdelibs.pc file is located\nto the PKG_CONFIG_PATH variable." )
+  endif( )
+
   # if the path is not already defined by user,
   # find kde-config executable
   if( NOT DEFINED KDECONFIG_EXECUTABLE )
     find_program( KDECONFIG_EXECUTABLE
       NAMES kde-config
-      HINTS ${BIN_INSTALL_DIR} )
+      HINTS "${TDE_PREFIX}/bin" ${BIN_INSTALL_DIR} )
     if( NOT KDECONFIG_EXECUTABLE )
       tde_message_fatal( "kde-config are NOT found." )
     endif( NOT KDECONFIG_EXECUTABLE )
+    set( KDECONFIG_EXECUTABLE ${KDECONFIG_EXECUTABLE}
+         CACHE INTERNAL "kde-config executable" )
   endif( NOT DEFINED KDECONFIG_EXECUTABLE )
 
+  set( ENV{LD_LIBRARY_PATH} "${TDE_LIBDIR}:$ENV{LD_LIBRARY_PATH}" )
   # check for installed trinity version
-  execute_process(
+  tde_execute_process(
     COMMAND ${KDECONFIG_EXECUTABLE} --version
     OUTPUT_VARIABLE _version
     RESULT_VARIABLE _result
-    OUTPUT_STRIP_TRAILING_WHITESPACE )
-  if( _result )
-    tde_message_fatal( "Unable to run kde-config!\n KDELIBS are correctly installed?\n Path to kde-config are corect?" )
-  endif( _result )
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    MESSAGE "Unable to run kde-config!\n KDELIBS are correctly installed?\n Path to kde-config are corect?" )
 
   # parse kde-config output, to extract TDE version
-  string( REGEX MATCH "KDE: ([0-9\\.]+)" __dummy "${_version}" )
-  set( TDE_VERSION "${CMAKE_MATCH_1}" )
+  string( REGEX MATCH "KDE: ([0-9\\.]+).*" __dummy "${_version}" )
+  set( TDE_VERSION "${CMAKE_MATCH_1}" CACHE INTERNAL "" )
 
   # ask kde-config for few paths
   macro( __internal_get_path __type __var )
-    execute_process(
+    tde_execute_process(
       COMMAND ${KDECONFIG_EXECUTABLE} --expandvars --install ${__type}
       OUTPUT_VARIABLE ${__var}
+      CACHE INTERNAL "TDE ${__type} path" FORCE
       OUTPUT_STRIP_TRAILING_WHITESPACE )
   endmacro( __internal_get_path )
 
@@ -59,11 +67,12 @@ if( NOT TDE_FOUND )
   macro( __internal_find_program __prog __var )
     find_program( ${__var}
       NAMES ${__prog}
-      HINTS ${TDE_BIN_INSTALL_DIR}
+      HINTS "${TDE_PREFIX}/bin" ${BIN_INSTALL_DIR}
       OUTPUT_STRIP_TRAILING_WHITESPACE )
     if( NOT ${__var} )
       tde_message_fatal( "${__prog} are NOT found.\n KDELIBS are correctly installed?" )
     endif( NOT ${__var} )
+    set( ${__var} ${${__var}} CACHE INTERNAL "${__prog} executable" FORCE )
   endmacro( __internal_find_program )
 
   __internal_find_program( dcopidl KDE3_DCOPIDL_EXECUTABLE )
@@ -77,10 +86,15 @@ if( NOT TDE_FOUND )
   # if PATH to kde-config is not set, dcopidlng will fail;
   # for this reason we set KDECONFIG environment variable before running dcopidlng
   set( KDE3_DCOPIDLNG_EXECUTABLE env KDECONFIG=${KDECONFIG_EXECUTABLE} ${KDE3_DCOPIDLNG_EXECUTABLE}
-    CACHE INTERNAL KDE3_DCOPIDLNG_EXECUTABLE FORCE )
+    CACHE INTERNAL "dcopidlng executable" FORCE )
+
+  # read source metadata
+  tde_read_src_metadata()
 
   message( STATUS "  found 'TDE', version ${TDE_VERSION}" )
 
 endif( NOT TDE_FOUND )
 
-include( "${TDE_CMAKE_DIR}/kdelibs.cmake" )
+if( NOT TARGET kdecore-shared )
+  include( "${TDE_CMAKE_DIR}/kdelibs.cmake" )
+endif()

modules/FindTQt.cmake

@@ -13,69 +13,107 @@ macro( tqt_message )
   message( STATUS "${ARGN}" )
 endmacro( )
 
-pkg_search_module( TQT tqt )
-
 if( NOT TQT_FOUND )
-  tde_message_fatal( "Unable to find tqt!\n Try adding the directory in which the tqt.pc file is located\nto the PKG_CONFIG_PATH variable." )
-endif( )
+  pkg_search_module( TQT tqt )
+
+  if( NOT TQT_FOUND )
+    tde_message_fatal( "Unable to find tqt!\n Try adding the directory in which the tqt.pc file is located\nto the PKG_CONFIG_PATH variable." )
+  endif( )
+
+  mark_as_advanced(
+    TMOC_EXECUTABLE
+    MOC_EXECUTABLE
+    UIC_EXECUTABLE
+  )
+
+  # tmoc_executable
+  tde_execute_process(
+    COMMAND pkg-config tqt --variable=tmoc_executable
+    OUTPUT_VARIABLE TMOC_EXECUTABLE
+    CACHE FILEPATH "TQt tmoc executable path"
+    OUTPUT_STRIP_TRAILING_WHITESPACE )
 
-# tmoc_executable
-execute_process(
-  COMMAND pkg-config tqt --variable=tmoc_executable
-  OUTPUT_VARIABLE TMOC_EXECUTABLE OUTPUT_STRIP_TRAILING_WHITESPACE )
+  if( NOT EXISTS ${TMOC_EXECUTABLE} )
+    tde_message_fatal( "tmoc is not found!\n tqt is correctly installed?" )
+  endif( )
 
-if( TMOC_EXECUTABLE )
   tqt_message( "  tmoc path: ${TMOC_EXECUTABLE}" )
-else( )
-  tde_message_fatal( "Path to tmoc is not set.\n tqt is correctly installed?" )
-endif( )
 
 
-# moc_executable
-execute_process(
-  COMMAND pkg-config tqt --variable=moc_executable
-  OUTPUT_VARIABLE MOC_EXECUTABLE OUTPUT_STRIP_TRAILING_WHITESPACE )
+  # moc_executable
+  tde_execute_process(
+    COMMAND pkg-config tqt --variable=moc_executable
+    OUTPUT_VARIABLE MOC_EXECUTABLE
+    CACHE FILEPATH "TQt moc executable path"
+    OUTPUT_STRIP_TRAILING_WHITESPACE )
+
+  if( NOT EXISTS ${MOC_EXECUTABLE} )
+    tde_message_fatal( "Path to moc is not set.\n tqt is correctly installed?" )
+  endif( )
 
-if( MOC_EXECUTABLE )
   tqt_message( "  moc path: ${MOC_EXECUTABLE}" )
-else( )
-  tde_message_fatal( "Path to moc is not set.\n tqt is correctly installed?" )
-endif( )
 
 
-# uic_executable
-execute_process(
-  COMMAND pkg-config tqt --variable=uic_executable
-  OUTPUT_VARIABLE UIC_EXECUTABLE OUTPUT_STRIP_TRAILING_WHITESPACE )
+  # uic_executable
+  tde_execute_process(
+    COMMAND pkg-config tqt --variable=uic_executable
+    OUTPUT_VARIABLE UIC_EXECUTABLE
+    CACHE FILEPATH "TQt uic executable path"
+    OUTPUT_STRIP_TRAILING_WHITESPACE )
+
+  if( NOT EXISTS ${UIC_EXECUTABLE} )
+    tde_message_fatal( "uic not found!\n tqt is correctly installed?" )
+  endif( )
 
-if( UIC_EXECUTABLE )
   tqt_message( "  uic path: ${UIC_EXECUTABLE}" )
-else( )
-  tde_message_fatal( "Path to uic is not set.\n tqt is correctly installed?" )
-endif( )
 
 
-# check if tqt is usable
-tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
-set( CMAKE_REQUIRED_INCLUDES ${TQT_INCLUDE_DIRS} )
-foreach( _dirs ${TQT_LIBRARY_DIRS} )
-  list( APPEND CMAKE_REQUIRED_LIBRARIES "-L${_dirs}" )
-endforeach()
-list( APPEND CMAKE_REQUIRED_LIBRARIES ${TQT_LIBRARIES} )
+  # tqt-replace script
+  set( TQT_REPLACE_SCRIPT "${TQT_PREFIX}/bin/tqt-replace"
+       CACHE FILEPATH "TQt replace script path" )
+
+  if( NOT EXISTS ${TQT_REPLACE_SCRIPT} )
+    tde_message_fatal( "tqt-replace not found!\n Check tqt installation." )
+  endif( )
 
-check_cxx_source_compiles("
+  tqt_message( "  tqt-replace path: ${TQT_REPLACE_SCRIPT}" )
+
+
+  # check if tqt is usable
+  tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
+  set( CMAKE_REQUIRED_INCLUDES ${TQT_INCLUDE_DIRS} )
+  foreach( _dirs ${TQT_LIBRARY_DIRS} )
+    list( APPEND CMAKE_REQUIRED_LIBRARIES "-L${_dirs}" )
+  endforeach()
+  list( APPEND CMAKE_REQUIRED_LIBRARIES ${TQT_LIBRARIES} )
+
+  check_cxx_source_compiles("
     #include <tqapplication.h>
     int main(int argc, char **argv) { TQApplication app(argc, argv); return 0; } "
-  HAVE_USABLE_TQT )
+    HAVE_USABLE_TQT )
+
+  if( NOT HAVE_USABLE_TQT )
+    tde_message_fatal( "Unable to build a simple tqt test." )
+  endif( )
+
+  tde_restore( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
+
+
+  # TQT_CMAKE_DIR
+  if( NOT DEFINED TQT_CMAKE_DIR )
+    set( TQT_CMAKE_DIR "${TQT_LIBDIR}/cmake"
+         CACHE FILEPATH "Path for shared TQt CMake targets" )
+  endif()
 
-if( NOT HAVE_USABLE_TQT )
-  tde_message_fatal( "Unable to build a simple tqt test." )
-endif( )
 
-tde_restore( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
+  # TQT_CXX_FLAGS
+  foreach( _flag ${TQT_CFLAGS} ${TQT_CFLAGS_OTHER} )
+    set( TQT_CXX_FLAGS "${TQT_CXX_FLAGS} ${_flag}" )
+  endforeach()
+  set( TQT_CXX_FLAGS "${TQT_CXX_FLAGS}" CACHE INTERNAL "" )
 
+endif( NOT TQT_FOUND )
 
-# TQT_CXX_FLAGS
-foreach( _flag ${TQT_CFLAGS_OTHER} )
-  set( TQT_CXX_FLAGS "${TQT_CXX_FLAGS} ${_flag}" )
-endforeach()
+# Set compiler flags according to build type
+set( CMAKE_CXX_FLAGS_RELWITHDEBINFO "-DNDEBUG" )
+set( CMAKE_C_FLAGS_RELWITHDEBINFO   "-DNDEBUG" )

modules/TDESetupPaths.cmake

@@ -35,13 +35,14 @@ macro( tde_setup_paths )
   _tde_internal_setup_path( SBIN_INSTALL_DIR          "${EXEC_INSTALL_PREFIX}/sbin"                 "The install dir for system executables (default ${EXEC_INSTALL_PREFIX}/sbin)" )
   _tde_internal_setup_path( LIB_INSTALL_DIR           "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}"     "The subdirectory relative to the install prefix where libraries will be installed (default is ${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX})" )
   _tde_internal_setup_path( LIBEXEC_INSTALL_DIR       "${LIB_INSTALL_DIR}/trinity/libexec"             "The subdirectory relative to the install prefix where libraries will be installed (default is ${LIB_INSTALL_DIR}/trinity/libexec)" )
+  _tde_internal_setup_path( PKGCONFIG_INSTALL_DIR     "${LIB_INSTALL_DIR}/pkgconfig"                "The install dir for pkg-config metadata files" )
   _tde_internal_setup_path( INCLUDE_INSTALL_DIR       "${CMAKE_INSTALL_PREFIX}/include"             "The subdirectory to the header prefix" )
 
   _tde_internal_setup_path( CMAKE_INSTALL_DIR         "${SHARE_INSTALL_PREFIX}/cmake"               "The install dir for cmake import modules" )
   _tde_internal_setup_path( PLUGIN_INSTALL_DIR        "${LIB_INSTALL_DIR}/trinity"                     "The subdirectory relative to the install prefix where plugins will be installed (default is ${LIB_INSTALL_DIR}/trinity)" )
   _tde_internal_setup_path( CONFIG_INSTALL_DIR        "${SHARE_INSTALL_PREFIX}/config"              "The config file install dir" )
   _tde_internal_setup_path( DATA_INSTALL_DIR          "${SHARE_INSTALL_PREFIX}/apps"                "The parent directory where applications can install their data" )
-  _tde_internal_setup_path( HTML_INSTALL_DIR          "${SHARE_INSTALL_PREFIX}/doc/kde/HTML"        "The HTML install dir for documentation" )
+  _tde_internal_setup_path( HTML_INSTALL_DIR          "${SHARE_INSTALL_PREFIX}/doc/tde/HTML"        "The HTML install dir for documentation" )
   _tde_internal_setup_path( ICON_INSTALL_DIR          "${SHARE_INSTALL_PREFIX}/icons"               "The icon install dir (default ${SHARE_INSTALL_PREFIX}/share/icons/)" )
   _tde_internal_setup_path( KCFG_INSTALL_DIR          "${SHARE_INSTALL_PREFIX}/config.kcfg"         "The install dir for kconfig files" )
   _tde_internal_setup_path( LOCALE_INSTALL_DIR        "${SHARE_INSTALL_PREFIX}/locale"              "The install dir for translations" )

modules/TDEVersion.cmake

@@ -0,0 +1,32 @@
+#################################################
+#
+#  (C) 2022 Michele Calgaro
+#  michele (DOT) calgaro (AT) yahoo (DOT) it
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+#################################################
+#####
+##### tde_set_project_version
+
+macro( tde_set_project_version )
+
+  set( DEFAULT_VERSION "3.5.13.3~[DEVELOPMENT]" )
+
+  unset( VERSION )
+
+  if( EXISTS ${CMAKE_SOURCE_DIR}/.tdescminfo )
+    file( STRINGS ${CMAKE_SOURCE_DIR}/.tdescminfo VERSION_STRING REGEX "^Version:.+$" )
+    string( REGEX REPLACE "^Version: ([0-9]+\.[0-9]+\.[0-9]+.*)$" "\\1" VERSION "${VERSION_STRING}" )
+  endif()
+
+  if( NOT VERSION )
+    set( VERSION "${DEFAULT_VERSION}" )
+  endif()
+
+endmacro( )
+

modules/tde_automoc.cmake

@@ -0,0 +1,76 @@
+#################################################
+#
+#  (C) 2022 Slávek Banko
+#  slavek (DOT) banko (AT) axis.cz
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+if( NOT ${CMAKE_CURRENT_LIST_DIR} STREQUAL ${CMAKE_ROOT}/Modules )
+  set( CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}" )
+endif()
+include( TDEMacros )
+
+
+get_filename_component( _src_file "${SRC_FILE}" ABSOLUTE )
+set( _meta_includes ${META_INCLUES} )
+unset( _moc_headers )
+
+if( EXISTS "${_src_file}" )
+
+  # read source file and check if have moc include
+  file( READ "${_src_file}" _src_content )
+  string( REGEX MATCHALL "#include +[^ ]+\\.moc[\">]" _moc_includes "${_src_content}" )
+
+  # found included moc(s)?
+  if( _moc_includes )
+    foreach( _moc_file ${_moc_includes} )
+
+      # extracting moc filename
+      string( REGEX MATCH "[^ <\"]+\\.moc" _moc_file "${_moc_file}" )
+      set( _moc_file "${CMAKE_CURRENT_BINARY_DIR}/${_moc_file}" )
+
+      # create header filename
+      get_filename_component( _src_path "${_src_file}" ABSOLUTE )
+      get_filename_component( _src_path "${_src_path}" PATH )
+      get_filename_component( _src_header "${_moc_file}" NAME_WE )
+      set( _header_file "${_src_path}/${_src_header}.h" )
+
+      # if header doesn't exists, check in META_INCLUDES
+      if( NOT EXISTS "${_header_file}" )
+        unset( _found )
+        foreach( _src_path ${_meta_includes} )
+          set( _header_file "${_src_path}/${_src_header}.h" )
+          if( EXISTS "${_header_file}" )
+            set( _found 1 )
+            break( )
+          endif( )
+        endforeach( )
+        if( NOT _found )
+          get_filename_component( _moc_file "${_moc_file}" NAME )
+          tde_message_fatal( "AUTOMOC error: '${_moc_file}' cannot be generated.\n Reason: '${_src_header}.h' not found." )
+        endif( )
+      endif( )
+
+      # moc-ing header
+      execute_process( COMMAND ${TMOC_EXECUTABLE} ${_header_file} -o ${_moc_file} )
+      list( APPEND _moc_headers "${_src_header}.h" )
+
+    endforeach( _moc_file )
+
+  endif( _moc_includes )
+
+else()
+  tde_message_fatal( "AUTOMOC error: '${_src_file}' not found!" )
+endif( EXISTS "${_src_file}" )
+
+get_filename_component( _automoc_file "${_src_file}+automoc" NAME )
+if( DEFINED _moc_headers )
+  string( REPLACE ";" "\n * " _moc_headers "${_moc_headers}" )
+  file( WRITE "${_automoc_file}" "/*\n * processed:\n * ${_moc_headers}\n */" )
+else()
+  file( WRITE "${_automoc_file}" "/* processed - no moc files */" )
+endif()

modules/tde_uic.cmake

@@ -9,24 +9,29 @@
 #
 #################################################
 
+if( NOT ${CMAKE_CURRENT_LIST_DIR} STREQUAL ${CMAKE_ROOT}/Modules )
+  set( CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}" )
+endif()
+include( TDEMacros )
+
 get_filename_component( _ui_basename ${UI_FILE} NAME_WE )
 
 # FIXME this will working only on out-of-source mode
 set( local_ui_file ${_ui_basename}.ui )
 configure_file( ${UI_FILE} ${local_ui_file} COPYONLY )
-execute_process( COMMAND tqt-replace ${local_ui_file} )
+tde_execute_process( COMMAND ${TQT_REPLACE_SCRIPT} ${local_ui_file} )
 
 # ui.h extension file, if exists
 if( EXISTS "${UI_FILE}.h" )
   configure_file( ${UI_FILE}.h ${local_ui_file}.h COPYONLY )
-  execute_process( COMMAND tqt-replace ${local_ui_file}.h )
+  tde_execute_process( COMMAND ${TQT_REPLACE_SCRIPT} ${local_ui_file}.h )
 endif( )
 
 if( TDE_QTPLUGINS_DIR )
   set( L -L ${TDE_QTPLUGINS_DIR} )
 endif( )
 
-execute_process( COMMAND ${UIC_EXECUTABLE}
+tde_execute_process( COMMAND ${UIC_EXECUTABLE}
   -nounload -tr tr2i18n
   ${L}
   ${local_ui_file}
@@ -38,7 +43,7 @@ if( _ui_h_content )
   file( WRITE ${_ui_basename}.h "${_ui_h_content}" )
 endif( )
 
-execute_process( COMMAND ${UIC_EXECUTABLE}
+tde_execute_process( COMMAND ${UIC_EXECUTABLE}
   -nounload -tr tr2i18n
   ${L}
   -impl ${_ui_basename}.h
@@ -49,4 +54,10 @@ if( _ui_cpp_content )
   string( REGEX REPLACE "tr2i18n\\(\"\"\\)" "QString::null" _ui_cpp_content "${_ui_cpp_content}" )
   string( REGEX REPLACE "tr2i18n\\(\"\", \"\"\\)" "QString::null" _ui_cpp_content "${_ui_cpp_content}" )
   file( WRITE ${_ui_basename}.cpp "#include <kdialog.h>\n#include <klocale.h>\n\n${_ui_cpp_content}" )
+
+  tde_execute_process( COMMAND ${MOC_EXECUTABLE}
+    ${_ui_basename}.h
+    OUTPUT_VARIABLE _ui_h_moc_content )
+  file( APPEND ${_ui_basename}.cpp "${_ui_h_moc_content}" )
+
 endif( )

templates/tde_export_library.cmake

@@ -1,6 +1,7 @@
 add_library( @_target@ @_type@ IMPORTED )
 
 set_target_properties( @_target@ PROPERTIES
+  INTERFACE_COMPILE_FEATURES "@_cxx_features@"
   IMPORTED_LINK_INTERFACE_LIBRARIES "@_shared_libs@"
   IMPORTED_LOCATION "@_location@"
   IMPORTED_SONAME "@_soname@" )