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

List:       kde-commits
Subject:    [marble/Applications/16.08] /: Sample FindMarble.cmake no longer needed
From:       Friedrich W. H. Kossebau <kossebau () kde ! org>
Date:       2016-08-07 15:10:17
Message-ID: E1bWPiT-0005Qq-Fo () code ! kde ! org
[Download RAW message or body]

Git commit 793c8e2bf3e0aac99cc5c85f6d0b334b2ea577b2 by Friedrich W. H. Koss=
ebau.
Committed on 07/08/2016 at 15:09.
Pushed by kossebau into branch 'Applications/16.08'.

Sample FindMarble.cmake no longer needed

The now installed cmake config files are a better solution

M  +0    -15   CMakeLists.txt
D  +0    -20   FindMarble.cmake.in

http://commits.kde.org/marble/793c8e2bf3e0aac99cc5c85f6d0b334b2ea577b2

diff --git a/CMakeLists.txt b/CMakeLists.txt
index aca50c9..94c1e06 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -161,7 +161,6 @@ endif()
 if(WIN32)
     set(data_dir data)
     set(plugin_dir plugins)
-    set(CMAKE_MODULES_INSTALL_PATH ${CMAKE_ROOT}/Modules)
 elseif(APPLE)
     # needed for finding bundle path in e.g. katlasdir.h
     FIND_LIBRARY(APP_SERVICES_LIBRARY ApplicationServices )
@@ -182,7 +181,6 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL Android)
 else() # Linux / bsd etc...
       set(data_dir ${CMAKE_INSTALL_FULL_DATAROOTDIR}/marble/data)
       set(plugin_dir ${CMAKE_INSTALL_FULL_LIBDIR}/marble/plugins)
-      set(CMAKE_MODULES_INSTALL_PATH ${CMAKE_INSTALL_FULL_DATAROOTDIR}/mar=
ble/cmake)
 endif()
 =

 if(NOT ICON_INSTALL_DIR)
@@ -308,19 +306,6 @@ endif()
 install(FILES LICENSE.txt DESTINATION ${MARBLE_DATA_INSTALL_PATH})
 install(FILES marble.appdata.xml DESTINATION ${CMAKE_INSTALL_FULL_DATAROOT=
DIR}/appdata/)
 =

-####################################################
-# Install CMake module
-
-CONFIGURE_FILE(
-    ${CMAKE_CURRENT_SOURCE_DIR}/FindMarble.cmake.in
-    ${CMAKE_CURRENT_BINARY_DIR}/FindMarble.cmake
-)
-
-if( CMAKE_MODULES_INSTALL_PATH AND NOT WIN32 )
-  install( FILES ${CMAKE_CURRENT_BINARY_DIR}/FindMarble.cmake
-           DESTINATION ${CMAKE_MODULES_INSTALL_PATH}  )
-endif()
-
 ############################################################
 # Uninstall stuff
 CONFIGURE_FILE(
diff --git a/FindMarble.cmake.in b/FindMarble.cmake.in
deleted file mode 100644
index adcde6b..0000000
--- a/FindMarble.cmake.in
+++ /dev/null
@@ -1,20 +0,0 @@
-# - Try to find the Marble Library
-# Once done this will define
-#
-#  MARBLE_FOUND - system has Marble
-#  MARBLE_INCLUDE_DIR - the Marble include directory
-#  MARBLE_LIBRARIES
-# Redistribution and use is allowed according to the terms of the BSD lice=
nse.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-IF ( MARBLE_INCLUDE_DIR AND MARBLE_LIBRARIES )
-   # in cache already
-   SET( MARBLE_FIND_QUIETLY TRUE )
-ENDIF ( MARBLE_INCLUDE_DIR AND MARBLE_LIBRARIES )
-
-FIND_PATH( MARBLE_INCLUDE_DIR NAMES marble/MarbleModel.h )
-FIND_LIBRARY( MARBLE_LIBRARIES NAMES @MARBLEWIDGET@ )
-
-INCLUDE( FindPackageHandleStandardArgs )
-FIND_PACKAGE_HANDLE_STANDARD_ARGS( marble DEFAULT_MSG MARBLE_INCLUDE_DIR M=
ARBLE_LIBRARIES )
[prev in list] [next in list] [prev in thread] [next in thread]