CMakeLists.txt   CMakeLists.txt 
skipping to change at line 15 skipping to change at line 15
SET(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true) SET(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
IF(COMMAND cmake_policy) IF(COMMAND cmake_policy)
CMAKE_POLICY(SET CMP0003 NEW) CMAKE_POLICY(SET CMP0003 NEW)
ENDIF() ENDIF()
########### Project name ########### ########### Project name ###########
PROJECT(Stellarium) PROJECT(Stellarium)
SET(STELLARIUM_MAJOR "0") SET(STELLARIUM_MAJOR "0")
SET(STELLARIUM_MINOR "11") SET(STELLARIUM_MINOR "11")
SET(STELLARIUM_PATCH "1") SET(STELLARIUM_PATCH "2")
SET(VERSION "${STELLARIUM_MAJOR}.${STELLARIUM_MINOR}.${STELLARIUM_PATCH}") SET(VERSION "${STELLARIUM_MAJOR}.${STELLARIUM_MINOR}.${STELLARIUM_PATCH}")
SET(PACKAGE stellarium) SET(PACKAGE stellarium)
SET(PACKAGE_VERSION "${VERSION}") SET(PACKAGE_VERSION "${VERSION}")
ADD_DEFINITIONS(-DPACKAGE_VERSION="${PACKAGE_VERSION}") ADD_DEFINITIONS(-DPACKAGE_VERSION="${PACKAGE_VERSION}")
# Use customized cmake macros # Use customized cmake macros
SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
########### Main global variables ########### ########### Main global variables ###########
skipping to change at line 148 skipping to change at line 148
SET(USE_PLUGIN_SATELLITES 1 CACHE BOOL "Define whether the Satellites plugi n should be created.") SET(USE_PLUGIN_SATELLITES 1 CACHE BOOL "Define whether the Satellites plugi n should be created.")
SET(USE_PLUGIN_TELESCOPECONTROL 1 CACHE BOOL "Define whether the TelescopeC ontrol plug-in should be created.") SET(USE_PLUGIN_TELESCOPECONTROL 1 CACHE BOOL "Define whether the TelescopeC ontrol plug-in should be created.")
SET(USE_PLUGIN_LOGBOOK 0 CACHE BOOL "Define whether the LogBook plugin shou ld be created.") SET(USE_PLUGIN_LOGBOOK 0 CACHE BOOL "Define whether the LogBook plugin shou ld be created.")
SET(USE_PLUGIN_OCULARS 1 CACHE BOOL "Define whether the Oculars plugin shou ld be created.") SET(USE_PLUGIN_OCULARS 1 CACHE BOOL "Define whether the Oculars plugin shou ld be created.")
SET(USE_PLUGIN_SVMT 0 CACHE BOOL "Define whether the SVMT plugin should be created.") SET(USE_PLUGIN_SVMT 0 CACHE BOOL "Define whether the SVMT plugin should be created.")
SET(USE_PLUGIN_TEXTUSERINTERFACE 1 CACHE BOOL "Define whether the TextUserI nterface plugin should be created.") SET(USE_PLUGIN_TEXTUSERINTERFACE 1 CACHE BOOL "Define whether the TextUserI nterface plugin should be created.")
SET(USE_PLUGIN_TIMEZONECONFIGURATION 1 CACHE BOOL "Define whether the TimeZ oneConfiguration plugin should be created.") SET(USE_PLUGIN_TIMEZONECONFIGURATION 1 CACHE BOOL "Define whether the TimeZ oneConfiguration plugin should be created.")
SET(USE_PLUGIN_VIRGO 0 CACHE BOOL "Define whether the VirGO plugin should b e created.") SET(USE_PLUGIN_VIRGO 0 CACHE BOOL "Define whether the VirGO plugin should b e created.")
SET(USE_PLUGIN_SOLARSYSTEMEDITOR 1 CACHE BOOL "Define whether the Solar Sys tem Editor should be built.") SET(USE_PLUGIN_SOLARSYSTEMEDITOR 1 CACHE BOOL "Define whether the Solar Sys tem Editor should be built.")
SET(USE_PLUGIN_SUPERNOVAE 1 CACHE BOOL "Define whether the Historical Super nova plugin should be created.") SET(USE_PLUGIN_SUPERNOVAE 1 CACHE BOOL "Define whether the Historical Super nova plugin should be created.")
SET(USE_PLUGIN_QUASARS 1 CACHE BOOL "Define whether the Quasars plugin shou
ld be created.")
SET(USE_PLUGIN_PULSARS 1 CACHE BOOL "Define whether the Pulsars plugin shou
ld be created.")
########## Static plugins need to define includes and libraries ########## Static plugins need to define includes and libraries
########## for the compilation of Stellarium itself ########## for the compilation of Stellarium itself
IF (BUILD_STATIC_PLUGINS) IF (BUILD_STATIC_PLUGINS)
IF (USE_PLUGIN_SVMT) IF (USE_PLUGIN_SVMT)
SET(QT_USE_QTXML TRUE) # For SVMT we also need QtXml module SET(QT_USE_QTXML TRUE) # For SVMT we also need QtXml module
SET(QT_USE_QTDECLARATIVE TRUE) # For SVMT we also need QML module, t his line doesn't seem to work right now SET(QT_USE_QTDECLARATIVE TRUE) # For SVMT we also need QML module, t his line doesn't seem to work right now
SET(QT_USE_QTWEBKIT TRUE) # For SVMT we also need QML module, this l ine doesn't seem to work right now SET(QT_USE_QTWEBKIT TRUE) # For SVMT we also need QML module, this l ine doesn't seem to work right now
ENDIF() ENDIF()
skipping to change at line 237 skipping to change at line 239
STRING(REPLACE "-lGL" "-lGLESv2" QT_LIBRARIES "${QT_LIBRARIES}") STRING(REPLACE "-lGL" "-lGLESv2" QT_LIBRARIES "${QT_LIBRARIES}")
ENDIF() ENDIF()
########### Set some global variables ########### ########### Set some global variables ###########
IF(UNIX AND NOT WIN32) IF(UNIX AND NOT WIN32)
IF(APPLE) IF(APPLE)
SET(CMAKE_INSTALL_PREFIX "${PROJECT_BINARY_DIR}/Stellarium.app/Contents") SET(CMAKE_INSTALL_PREFIX "${PROJECT_BINARY_DIR}/Stellarium.app/Contents")
ELSE(APPLE) ELSE(APPLE)
ADD_DEFINITIONS(-DINSTALL_DATADIR="${CMAKE_INSTALL_PREFIX}/share/stellari um") ADD_DEFINITIONS(-DINSTALL_DATADIR="${CMAKE_INSTALL_PREFIX}/share/stellari um")
ADD_DEFINITIONS(-DINSTALL_LOCALEDIR="${CMAKE_INSTALL_PREFIX}/share/locale ") ADD_DEFINITIONS(-DINSTALL_LOCALEDIR="${CMAKE_INSTALL_PREFIX}/share/locale ")
# Used in generating the documentation (doc/stellarium.pod.cmake):
SET(INSTALL_DATADIR "${CMAKE_INSTALL_PREFIX}/share/stellarium")
ENDIF() ENDIF()
ELSE() ELSE()
ADD_DEFINITIONS(-DINSTALL_DATADIR=".") ADD_DEFINITIONS(-DINSTALL_DATADIR=".")
ADD_DEFINITIONS(-DINSTALL_LOCALEDIR="./locale") ADD_DEFINITIONS(-DINSTALL_LOCALEDIR="./locale")
ENDIF() ENDIF()
########### Get revision number for non-release builds ########### ########### Get revision number for non-release builds ###########
IF(NOT RELEASE_BUILD) IF(NOT RELEASE_BUILD)
#Hack until CMake detection for Bazaar is finished #Hack until CMake detection for Bazaar is finished
IF(BZR_REVISION) IF(BZR_REVISION)
 End of changes. 3 change blocks. 
1 lines changed or deleted 7 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/