Commit ac08536d authored by Friedrich W. H. Kossebau's avatar Friedrich W. H. Kossebau
Browse files

Sample FindMarble.cmake no longer needed

The now installed cmake config files are a better solution
parent 3099e612
......@@ -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(
......
# - 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 )
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment