[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-buildsystem
Subject:    FindKdepimLibs.cmake: please do not hardcode paths
From:       Modestas Vainius <modestas () vainius ! eu>
Date:       2008-12-03 17:02:10
Message-ID: 200812031902.24985.modestas () vainius ! eu
[Download RAW message or body]

[Attachment #2 (multipart/signed)]

[Attachment #4 (multipart/mixed)]


Hello,

please do not hardcode paths in FindKdepimLibs.cmake. Some distributions use 
/usr/share/kde4/ as DATA_INSTALL_DIR. So at least please use that one as a 
reference. However, I also do not understand why additional path hackery is 
needed (how many people are going to install pimlibs to other prefix than 
kdelibs?) so I attach a patch which removes it. Tested and works.

-- 
Modestas Vainius <modestas@vainius.eu>


["24_findkdepimlibs_no_hardcoded_paths.diff" (text/x-patch)]

--- a/cmake/modules/FindKdepimLibs.cmake
+++ b/cmake/modules/FindKdepimLibs.cmake
@@ -56,19 +56,15 @@
 if( KDEPIMLIBS_INCLUDE_DIR )
   set(KDEPIMLIBS_FOUND TRUE)
 
-  get_filename_component( kdepimlibs_cmake_module_dir  "${KDEPIMLIBS_INCLUDE_DIR}" \
                PATH)
-  set(kdepimlibs_cmake_module_dir \
                "${kdepimlibs_cmake_module_dir}/share/apps/cmake/modules")
-  set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${kdepimlibs_cmake_module_dir}")
-
   # this file contains all dependencies of all libraries of kdepimlibs, Alex
-  include("${kdepimlibs_cmake_module_dir}/KDEPimLibsInformation.cmake" OPTIONAL \
RESULT_VARIABLE _newKdepimLibsFound) +  include(KDEPimLibsInformation OPTIONAL \
RESULT_VARIABLE _newKdepimLibsFound)  # if this file could not be loaded, we found an \
older version of Kdepimlibs, tell the  # developer that he should update kdepimlibs. \
Alex  if (NOT _newKdepimLibsFound)
      message(FATAL_ERROR "You need a newer version of kdepimlibs, please update it")
   endif (NOT _newKdepimLibsFound)
   
-  include("${kdepimlibs_cmake_module_dir}/KDEPimLibsLibraryTargets.cmake")
+  include(KDEPimLibsLibraryTargets)
 
   _kdepimlibs_set_lib_vars( AKONADI        akonadi-kde)
   _kdepimlibs_set_lib_vars( AKONADI_KMIME  akonadi-kmime)


["signature.asc" (application/pgp-signature)]

_______________________________________________
Kde-buildsystem mailing list
Kde-buildsystem@kde.org
https://mail.kde.org/mailman/listinfo/kde-buildsystem


[prev in list] [next in list] [prev in thread] [next in thread]