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

List:       kde-commits
Subject:    KDE/kdegraphics
From:       Albert Astals Cid <tsdgeos () terra ! es>
Date:       2010-09-26 17:31:31
Message-ID: 20100926173131.EA1EDAC857 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1179984 by aacid:

Alex says FindOkular.cmake is not the way to go and that we need to install an OkularConfig.cmake

That get_filename_component thing seems quite fragile and hacky to me but he is the expert :-)

CCMAIL: neundorf@kde.org


 M  +0 -1      cmake/modules/CMakeLists.txt  
 D             cmake/modules/FindOkular.cmake  
 M  +8 -0      okular/CMakeLists.txt  
 A             okular/OkularConfig.cmake  


--- trunk/KDE/kdegraphics/cmake/modules/CMakeLists.txt #1179983:1179984
@@ -1,7 +1,6 @@
 # explicitely install the "public" cmake files
 
 set(cmakeFiles
-  FindOkular.cmake
   FindKSane.cmake
 )
 
--- trunk/KDE/kdegraphics/okular/CMakeLists.txt #1179983:1179984
@@ -5,6 +5,7 @@
 add_subdirectory( tests )
 
 include(OkularConfigureChecks.cmake)
+include(MacroWriteBasicCMakeVersionFile)
 
 if(NOT WIN32)
  set(MATH_LIB m)
@@ -181,3 +182,10 @@
 install( FILES okular_part.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )
 install( FILES part.rc DESTINATION ${DATA_INSTALL_DIR}/okular )
 
+########### cmake files #################
+
+macro_write_basic_cmake_version_file(${CMAKE_CURRENT_BINARY_DIR}/OkularConfigVersion.cmake 0 11 80)
+
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/OkularConfig.cmake
+              ${CMAKE_CURRENT_BINARY_DIR}/OkularConfigVersion.cmake
+        DESTINATION ${LIB_INSTALL_DIR}/cmake/Okular )
\ No newline at end of file
[prev in list] [next in list] [prev in thread] [next in thread]