CMakeLists.txt   CMakeLists.txt 
skipping to change at line 14 skipping to change at line 14
# Avoid repeating the IF statement in the ENDIF and ELSE # Avoid repeating the IF statement in the ENDIF and ELSE
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 "10") SET(STELLARIUM_MINOR "11")
SET(STELLARIUM_PATCH "6") SET(STELLARIUM_PATCH "0")
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 60 skipping to change at line 60
IF(BUILD_FOR_MAEMO) IF(BUILD_FOR_MAEMO)
# Optimize for N900 ARM processor # Optimize for N900 ARM processor
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-omit-frame-pointer -fno-optimize -sibling-calls -D_REENTRANT -DQT_GL_NO_SCISSOR_TEST -DQT_DEFAULT_TEXTURE_GL YPH_CACHE_WIDTH=1024 -mtune=cortex-a8 -march=armv7-a -ftree-vectorize -mfpu =neon -mfloat-abi=softfp -ffast-math -funroll-loops -DBUILD_FOR_MAEMO") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-omit-frame-pointer -fno-optimize -sibling-calls -D_REENTRANT -DQT_GL_NO_SCISSOR_TEST -DQT_DEFAULT_TEXTURE_GL YPH_CACHE_WIDTH=1024 -mtune=cortex-a8 -march=armv7-a -ftree-vectorize -mfpu =neon -mfloat-abi=softfp -ffast-math -funroll-loops -DBUILD_FOR_MAEMO")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-omit-frame-pointer -fno-opti mize-sibling-calls -D_REENTRANT -DQT_GL_NO_SCISSOR_TEST -DQT_DEFAULT_TEXTUR E_GLYPH_CACHE_WIDTH=1024 -mtune=cortex-a8 -march=armv7-a -ftree-vectorize - mfpu=neon -mfloat-abi=softfp -ffast-math -funroll-loops -DBUILD_FOR_MAEMO") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-omit-frame-pointer -fno-opti mize-sibling-calls -D_REENTRANT -DQT_GL_NO_SCISSOR_TEST -DQT_DEFAULT_TEXTUR E_GLYPH_CACHE_WIDTH=1024 -mtune=cortex-a8 -march=armv7-a -ftree-vectorize - mfpu=neon -mfloat-abi=softfp -ffast-math -funroll-loops -DBUILD_FOR_MAEMO")
ENDIF() ENDIF()
# best way to get to APPLE? # best way to get to APPLE?
IF(APPLE) IF(APPLE)
SET(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -fno-common -Wall -Wextra") SET(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -fno-common -Wall -Wextra")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-common -Wall -Wextra -Wno-unused- parameter") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-common -Wall -Wextra -Wno-unused- parameter")
# SET(CMAKE_OSX_DEPLOYMENT_TARGET "10.5")
# SET(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.5.sdk/") # uncomment one of the following, depending on minimum OS level you want
# Universal binary #SET(CMAKE_OSX_DEPLOYMENT_TARGET "10.5")
#SET(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.5.sdk/")
#SET(CMAKE_OSX_DEPLOYMENT_TARGET "10.6")
#SET(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.6.sdk/")
# uncomment one of the following, depending on what platforms you want.
# NOTE: Qt build for Cocoa is Intel only. Qt with Carbon is both, but doe
s not seem
# to handle 64bit well.
#SET(CMAKE_OSX_ARCHITECTURES "i386;x86_64;ppc;ppc64")
#SET(CMAKE_OSX_ARCHITECTURES "i386;x86_64")
#SET(CMAKE_OSX_ARCHITECTURES "x86_64") #SET(CMAKE_OSX_ARCHITECTURES "x86_64")
ENDIF() ENDIF()
########### Check functions ########### ########### Check functions ###########
INCLUDE(CheckFunctionExists) INCLUDE(CheckFunctionExists)
SET(CMAKE_REQUIRED_LIBRARIES "-lm") SET(CMAKE_REQUIRED_LIBRARIES "-lm")
CHECK_FUNCTION_EXISTS(pow10 HAVE_POW10) CHECK_FUNCTION_EXISTS(pow10 HAVE_POW10)
SET(CMAKE_REQUIRED_LIBRARIES) SET(CMAKE_REQUIRED_LIBRARIES)
IF(HAVE_POW10) IF(HAVE_POW10)
ADD_DEFINITIONS(-DHAVE_POW10) ADD_DEFINITIONS(-DHAVE_POW10)
skipping to change at line 138 skipping to change at line 147
SET(USE_PLUGIN_COMPASSMARKS 1 CACHE BOOL "Define whether the CompassMarks p lugin should be created.") SET(USE_PLUGIN_COMPASSMARKS 1 CACHE BOOL "Define whether the CompassMarks p lugin should be created.")
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_SUPERNOVAS 1 CACHE BOOL "Define whether the Historical Super nova plugin should 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
ENDIF() ENDIF()
IF (USE_PLUGIN_VIRGO) IF (USE_PLUGIN_VIRGO)
## Library for loading FITS image files ## Library for loading FITS image files
FIND_PATH(CFITSIO_INCLUDE_DIR fitsio.h FIND_PATH(CFITSIO_INCLUDE_DIR fitsio.h
/usr/include /usr/include
/usr/local/include /usr/local/include
DOC "Should point to the directory where the include files for lib cfitsio are installed") DOC "Should point to the directory where the include files for lib cfitsio are installed")
FIND_LIBRARY(CFITSIO_LIBRARIES cfitsio FIND_LIBRARY(CFITSIO_LIBRARIES cfitsio
PATHS PATHS
/usr/lib/ /usr/lib/
/usr/local/lib /usr/local/lib
/opt/local/lib /opt/local/lib
DOC "cfitsio link options") DOC "cfitsio link options")
SET(QT_USE_QTXML TRUE) # For VirGO we also need QtXml module SET(QT_USE_QTXML TRUE) # For VirGO we also need QtXml module
ENDIF() ENDIF()
IF (USE_PLUGIN_LOGBOOK)
SET(QT_USE_QTSQL TRUE) # For LogBook we also need SQL module
ENDIF()
ENDIF() ENDIF()
# Custom target used to manage dependencies of stellarium -> Static plugins # Custom target used to manage dependencies of stellarium -> Static plugins
# It is important that static plugins are compiled before stellarium main e xecutable is linked # It is important that static plugins are compiled before stellarium main e xecutable is linked
ADD_CUSTOM_TARGET(AllStaticPlugins ALL) ADD_CUSTOM_TARGET(AllStaticPlugins ALL)
########### Find packages ########### ########### Find packages ###########
SET(QT_MIN_VERSION "4.6.0") SET(QT_MIN_VERSION "4.6.0")
FIND_PACKAGE(Qt4 REQUIRED) FIND_PACKAGE(Qt4 REQUIRED)
SET(QT_USE_QTOPENGL TRUE) SET(QT_USE_QTOPENGL TRUE)
skipping to change at line 284 skipping to change at line 300
SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING") SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
SET(CPACK_PACKAGE_VERSION_MAJOR ${STELLARIUM_MAJOR}) SET(CPACK_PACKAGE_VERSION_MAJOR ${STELLARIUM_MAJOR})
SET(CPACK_PACKAGE_VERSION_MINOR ${STELLARIUM_MINOR}) SET(CPACK_PACKAGE_VERSION_MINOR ${STELLARIUM_MINOR})
SET(CPACK_PACKAGE_VERSION_PATCH ${STELLARIUM_PATCH}) SET(CPACK_PACKAGE_VERSION_PATCH ${STELLARIUM_PATCH})
SET(CPACK_PACKAGE_INSTALL_DIRECTORY "stellarium") SET(CPACK_PACKAGE_INSTALL_DIRECTORY "stellarium")
SET(CPACK_SOURCE_PACKAGE_FILE_NAME "stellarium-${VERSION}") SET(CPACK_SOURCE_PACKAGE_FILE_NAME "stellarium-${VERSION}")
SET(CPACK_SOURCE_GENERATOR "TGZ") SET(CPACK_SOURCE_GENERATOR "TGZ")
SET(CPACK_GENERATOR "TGZ") SET(CPACK_GENERATOR "TGZ")
SET(CPACK_STRIP_FILES "bin/stellarium") SET(CPACK_STRIP_FILES "bin/stellarium")
SET(CPACK_PACKAGE_EXECUTABLES "stellarium" "Stellarium") SET(CPACK_PACKAGE_EXECUTABLES "stellarium" "Stellarium")
SET(CPACK_SOURCE_IGNORE_FILES "/CVS/" "/.svn/" "/.git/" "/.bzr/" "builds/ " "installers/" "Stellarium.tag$" "Stellarium.kdevelop.pcs$" "~$" "\\\\.swp $" "\\\\.#" "/#") SET(CPACK_SOURCE_IGNORE_FILES "/CVS/" "/.svn/" "/.git/" "/.bzr/" "builds/ " "installers/" "Stellarium.tag$" "Stellarium.kdevelop.pcs$" "/CMakeLists.t xt.user$" "\\\\.bzrignore$" "~$" "\\\\.swp$" "\\\\.#" "/#")
INCLUDE(CPack) INCLUDE(CPack)
ENDIF() ENDIF()
########### Macosx Bundling ############### ########### Macosx Bundling ###############
IF(APPLE) IF(APPLE)
ADD_CUSTOM_TARGET(macosx_bundle bash util/macosx_bundle.sh ${CMAKE_INSTALL_ PREFIX} ${PROJECT_SOURCE_DIR} DEPENDS install WORKING_DIRECTORY ${PROJECT_S OURCE_DIR} COMMENT "making the macosx bundle." VERBATIM) ADD_CUSTOM_TARGET(macosx_bundle bash util/macosx_bundle.sh ${CMAKE_INSTALL_ PREFIX} ${PROJECT_SOURCE_DIR} DEPENDS install WORKING_DIRECTORY ${PROJECT_S OURCE_DIR} COMMENT "making the macosx bundle." VERBATIM)
ENDIF() ENDIF()
########### Generate doxygen doc ############### ########### Generate doxygen doc ###############
CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/Doxyfile.cmake ${CMAKE_CURRENT_BINARY_ DIR}/Doxyfile @ONLY) CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/Doxyfile.cmake ${CMAKE_CURRENT_BINARY_ DIR}/Doxyfile @ONLY)
 End of changes. 6 change blocks. 
6 lines changed or deleted 23 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/