summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedrich W. H. Kossebau <kossebau@kde.org>2016-08-07 15:07:45 (GMT)
committerFriedrich W. H. Kossebau <kossebau@kde.org>2016-08-07 15:07:45 (GMT)
commitac08536d260454f952dba2e0d1bd726855c4c655 (patch)
treef085127371165b66cdc5df5e4485fd0e92be39fc
parent3099e6122fa4539bcc2d07790c6021493754e726 (diff)
Sample FindMarble.cmake no longer needed
The now installed cmake config files are a better solution
-rw-r--r--CMakeLists.txt15
-rw-r--r--FindMarble.cmake.in20
2 files changed, 0 insertions, 35 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ceb61d9..9656573 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}/marble/cmake)
endif()
if(NOT ICON_INSTALL_DIR)
@@ -308,19 +306,6 @@ endif()
# Install extra files
install(FILES LICENSE.txt DESTINATION ${MARBLE_DATA_INSTALL_PATH})
-####################################################
-# 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 license.
-# 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 MARBLE_LIBRARIES )