tde_create_handbook: Install symlink for 'common' part as relative.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 6b4c7a9ef0)

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

@@ -28,6 +28,8 @@ if( NOT TDE_FOUND )
     if( NOT KDECONFIG_EXECUTABLE )
       tde_message_fatal( "tde-config are NOT found." )
     endif( NOT KDECONFIG_EXECUTABLE )
+    set( KDECONFIG_EXECUTABLE ${KDECONFIG_EXECUTABLE}
+         CACHE INTERNAL "tde-config executable" )
   endif( NOT DEFINED KDECONFIG_EXECUTABLE )
 
   set( ENV{LD_LIBRARY_PATH} "${TDE_LIBDIR}:$ENV{LD_LIBRARY_PATH}" )
@@ -41,7 +43,7 @@ if( NOT TDE_FOUND )
 
   # parse tde-config output, to extract TDE version
   string( REGEX MATCH "TDE: R([0-9\\.]+).*" __dummy "${_version}" )
-  set( TDE_VERSION "${CMAKE_MATCH_1}" )
+  set( TDE_VERSION "${CMAKE_MATCH_1}" CACHE INTERNAL "" )
 
   # ask tde-config for few paths
   macro( __internal_get_path __type __var )
@@ -68,7 +70,7 @@ if( NOT TDE_FOUND )
       HINTS "${TDE_PREFIX}/bin" ${BIN_INSTALL_DIR}
       OUTPUT_STRIP_TRAILING_WHITESPACE )
     if( NOT ${__var} )
-      tde_message_fatal( "${__prog} are NOT found.\n TDELIBS are correctly installed?" )
+      tde_message_fatal( "${__prog} is NOT found.\n TDELIBS are correctly installed?" )
     endif( NOT ${__var} )
     set( ${__var} ${${__var}} CACHE INTERNAL "${__prog} executable" FORCE )
   endmacro( __internal_find_program )
@@ -79,6 +81,13 @@ if( NOT TDE_FOUND )
   __internal_find_program( meinproc KDE3_MEINPROC_EXECUTABLE )
   __internal_find_program( tdeconfig_compiler KDE3_KCFGC_EXECUTABLE )
   __internal_find_program( maketdewidgets KDE3_MAKETDEWIDGETS_EXECUTABLE )
+  # Don't use __internal_find_program due to it's not mandatory
+  if( NOT DEFINED TDELFEDITOR_EXECUTABLE )
+    find_program( TDELFEDITOR_EXECUTABLE NAMES tdelfeditor
+      HINTS "${TDE_PREFIX}/bin" ${BIN_INSTALL_DIR} OUTPUT_STRIP_TRAILING_WHITESPACE )
+    set( TDELFEDITOR_EXECUTABLE ${TDELFEDITOR_EXECUTABLE}
+         CACHE INTERNAL "tdelfeditor executable" )
+  endif( )
 
   # dcopidlng is a bash script which using tde-config;
   # if PATH to tde-config is not set, dcopidlng will fail;
@@ -86,16 +95,13 @@ if( NOT TDE_FOUND )
   set( KDE3_DCOPIDLNG_EXECUTABLE env KDECONFIG=${KDECONFIG_EXECUTABLE} ${KDE3_DCOPIDLNG_EXECUTABLE}
     CACHE INTERNAL "dcopidlng executable" FORCE )
 
-  # look for SCM data if present
-  if( EXISTS "${CMAKE_SOURCE_DIR}/.tdescmmodule" )
-    file( STRINGS "${CMAKE_SOURCE_DIR}/.tdescmmodule" TDE_SCM_MODULE_NAME )
-  endif( EXISTS "${CMAKE_SOURCE_DIR}/.tdescmmodule" )
-  if( EXISTS "${CMAKE_SOURCE_DIR}/.tdescmrevision" )
-    file( STRINGS "${CMAKE_SOURCE_DIR}/.tdescmrevision" TDE_SCM_MODULE_REVISION )
-  endif( EXISTS "${CMAKE_SOURCE_DIR}/.tdescmrevision" )
+  # read source metadata
+  tde_read_src_metadata()
 
   message( STATUS "  found 'TDE', version ${TDE_VERSION}" )
 
 endif( NOT TDE_FOUND )
 
-include( "${TDE_CMAKE_DIR}/tdelibs.cmake" )
+if( NOT TARGET tdecore-shared )
+  include( "${TDE_CMAKE_DIR}/tdelibs.cmake" )
+endif()

modules/FindTQt.cmake

@@ -13,83 +13,110 @@ 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( )
 
-# tmoc_executable
-tde_execute_process(
-  COMMAND pkg-config tqt --variable=tmoc_executable
-  OUTPUT_VARIABLE TMOC_EXECUTABLE OUTPUT_STRIP_TRAILING_WHITESPACE )
+  mark_as_advanced(
+    TMOC_EXECUTABLE
+    MOC_EXECUTABLE
+    UIC_EXECUTABLE
+  )
 
-if( NOT EXISTS ${TMOC_EXECUTABLE} )
-  tde_message_fatal( "tmoc is not found!\n tqt is correctly installed?" )
-endif( )
+  # 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 )
 
-tqt_message( "  tmoc path: ${TMOC_EXECUTABLE}" )
+  if( NOT EXISTS ${TMOC_EXECUTABLE} )
+    tde_message_fatal( "tmoc is not found!\n tqt is correctly installed?" )
+  endif( )
 
+  tqt_message( "  tmoc path: ${TMOC_EXECUTABLE}" )
 
-# moc_executable
-tde_execute_process(
-  COMMAND pkg-config tqt --variable=moc_executable
-  OUTPUT_VARIABLE MOC_EXECUTABLE OUTPUT_STRIP_TRAILING_WHITESPACE )
 
-if( NOT EXISTS ${MOC_EXECUTABLE} )
-  tde_message_fatal( "Path to moc is not set.\n tqt is correctly installed?" )
-endif( )
+  # 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 )
 
-tqt_message( "  moc path: ${MOC_EXECUTABLE}" )
+  if( NOT EXISTS ${MOC_EXECUTABLE} )
+    tde_message_fatal( "Path to moc is not set.\n tqt is correctly installed?" )
+  endif( )
 
+  tqt_message( "  moc path: ${MOC_EXECUTABLE}" )
 
-# uic_executable
-tde_execute_process(
-  COMMAND pkg-config tqt --variable=uic_executable
-  OUTPUT_VARIABLE UIC_EXECUTABLE OUTPUT_STRIP_TRAILING_WHITESPACE )
 
-if( NOT EXISTS ${UIC_EXECUTABLE} )
-  tde_message_fatal( "uic not found!\n tqt is correctly installed?" )
-endif( )
+  # 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 )
 
-tqt_message( "  uic path: ${UIC_EXECUTABLE}" )
+  if( NOT EXISTS ${UIC_EXECUTABLE} )
+    tde_message_fatal( "uic not found!\n tqt is correctly installed?" )
+  endif( )
 
+  tqt_message( "  uic path: ${UIC_EXECUTABLE}" )
 
-# tqt-replace script
-set( TQT_REPLACE_SCRIPT "${TQT_PREFIX}/bin/tqt-replace" )
 
-if( NOT EXISTS ${TQT_REPLACE_SCRIPT} )
-  tde_message_fatal( "tqt-replace not found!\n Check tqt installation." )
-endif( )
+  # tqt-replace script
+  set( TQT_REPLACE_SCRIPT "${TQT_PREFIX}/bin/tqt-replace"
+       CACHE FILEPATH "TQt replace script path" )
 
-tqt_message( "  tqt-replace path: ${TQT_REPLACE_SCRIPT}" )
+  if( NOT EXISTS ${TQT_REPLACE_SCRIPT} )
+    tde_message_fatal( "tqt-replace not found!\n Check tqt installation." )
+  endif( )
 
+  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("
+  # 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( )
 
-if( NOT HAVE_USABLE_TQT )
-  tde_message_fatal( "Unable to build a simple tqt test." )
-endif( )
+  tde_restore( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
 
-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()
 
-# TQT_CXX_FLAGS
-foreach( _flag ${TQT_CFLAGS} ${TQT_CFLAGS_OTHER} )
-  set( TQT_CXX_FLAGS "${TQT_CXX_FLAGS} ${_flag}" )
-endforeach()
+
+  # 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 )
 
 # Set compiler flags according to build type
 set( CMAKE_CXX_FLAGS_RELWITHDEBINFO "-DNDEBUG" )
 set( CMAKE_C_FLAGS_RELWITHDEBINFO   "-DNDEBUG" )
+
+# Set the required minimum C++ standard
+set( TDE_CXX_FEATURES cxx_nullptr )

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 "R14.0.13~[DEVELOPMENT]" )
+
+  unset( VERSION )
+
+  if( EXISTS ${CMAKE_SOURCE_DIR}/.tdescminfo )
+    file( STRINGS ${CMAKE_SOURCE_DIR}/.tdescminfo VERSION_STRING REGEX "^Version:.+$" )
+    string( REGEX REPLACE "^Version: (R[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,7 +9,9 @@
 #
 #################################################
 
-set( CMAKE_MODULE_PATH "${MASTER_SOURCE_DIR}/cmake/modules" )
+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 )
@@ -29,8 +31,16 @@ if( TDE_QTPLUGINS_DIR )
   set( L -L ${TDE_QTPLUGINS_DIR} )
 endif( )
 
+# Choose translation function, different for TQt and TDE
+if ( TDE_FOUND AND NOT TQT_ONLY )
+  set( TR_FUNC "tr2i18n" )
+else( TDE_FOUND AND NOT TQT_ONLY )
+  set( TR_FUNC "tr" )
+endif( TDE_FOUND AND NOT TQT_ONLY )
+
+# Generate ui .h file
 tde_execute_process( COMMAND ${UIC_EXECUTABLE}
-  -nounload -tr tr2i18n
+  -nounload -tr ${TR_FUNC}
   ${L}
   ${local_ui_file}
   OUTPUT_VARIABLE _ui_h_content )
@@ -38,24 +48,35 @@ tde_execute_process( COMMAND ${UIC_EXECUTABLE}
 if( _ui_h_content )
   string( REGEX REPLACE "#ifndef " "#ifndef UI_" _ui_h_content "${_ui_h_content}" )
   string( REGEX REPLACE "#define " "#define UI_" _ui_h_content "${_ui_h_content}" )
-  string( REGEX REPLACE "public TQWizard" "public KWizard" _ui_h_content "${_ui_h_content}" )
-  string( REGEX REPLACE "public QWizard" "public KWizard" _ui_h_content "${_ui_h_content}" )
-  string( REGEX REPLACE "#include <ntqwizard.h>" "#include <kwizard.h>" _ui_h_content "${_ui_h_content}" )
-  string( REGEX REPLACE "#include <qwizard.h>" "#include <kwizard.h>" _ui_h_content "${_ui_h_content}" )
+  if ( TDE_FOUND AND NOT TQT_ONLY )
+    string( REGEX REPLACE "public TQWizard" "public KWizard" _ui_h_content "${_ui_h_content}" )
+    string( REGEX REPLACE "public QWizard" "public KWizard" _ui_h_content "${_ui_h_content}" )
+    string( REGEX REPLACE "#include <ntqwizard.h>" "#include <kwizard.h>" _ui_h_content "${_ui_h_content}" )
+    string( REGEX REPLACE "#include <qwizard.h>" "#include <kwizard.h>" _ui_h_content "${_ui_h_content}" )
+  endif( TDE_FOUND AND NOT TQT_ONLY )
   file( WRITE ${_ui_basename}.h "${_ui_h_content}" )
 endif( )
 
+# Generate ui .cpp file
 tde_execute_process( COMMAND ${UIC_EXECUTABLE}
-  -nounload -tr tr2i18n
+  -nounload -tr ${TR_FUNC}
   ${L}
   -impl ${_ui_basename}.h
   ${local_ui_file}
   OUTPUT_VARIABLE _ui_cpp_content )
 
 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}" )
-  string( REGEX REPLACE ": TQWizard\\(" ": KWizard(" _ui_cpp_content "${_ui_cpp_content}" )
-  string( REGEX REPLACE ": QWizard\\(" ": KWizard(" _ui_cpp_content "${_ui_cpp_content}" )
-  file( WRITE ${_ui_basename}.cpp "#include <kdialog.h>\n#include <tdelocale.h>\n\n${_ui_cpp_content}" )
-endif( )
+  string( REGEX REPLACE "${TR_FUNC}\\(\"\"\\)" "TQString::null" _ui_cpp_content "${_ui_cpp_content}" )
+  string( REGEX REPLACE "${TR_FUNC}\\(\"\", \"\"\\)" "TQString::null" _ui_cpp_content "${_ui_cpp_content}" )
+  if ( TDE_FOUND AND NOT TQT_ONLY )
+    string( REGEX REPLACE ": TQWizard\\(" ": KWizard(" _ui_cpp_content "${_ui_cpp_content}" )
+    string( REGEX REPLACE ": QWizard\\(" ": KWizard(" _ui_cpp_content "${_ui_cpp_content}" )
+    set( _ui_cpp_content "#include <kdialog.h>\n#include <tdelocale.h>\n\n${_ui_cpp_content}" )
+  endif( TDE_FOUND AND NOT TQT_ONLY )
+  file( WRITE ${_ui_basename}.cpp "${_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( _ui_cpp_content )

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@" )