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 "10") SET(STELLARIUM_MINOR "10")
SET(STELLARIUM_PATCH "5") SET(STELLARIUM_PATCH "6")
SET(VERSION "${STELLARIUM_MAJOR}.${STELLARIUM_MINOR}.${STELLARIUM_PATCH}") SET(VERSION "${STELLARIUM_MAJOR}.${STELLARIUM_MINOR}.${STELLARIUM_PATCH}")
SET(PACKAGE stellarium) SET(PACKAGE stellarium)
ADD_DEFINITIONS(-DPACKAGE_VERSION="${VERSION}") SET(PACKAGE_VERSION "${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 ###########
IF(NOT CMAKE_BUILD_TYPE) IF(NOT CMAKE_BUILD_TYPE)
SET(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build, opti ons are: None Debug Release RelWithDebInfo MinSizeRel." FORCE) SET(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build, opti ons are: None Debug Release RelWithDebInfo MinSizeRel." FORCE)
ENDIF() ENDIF()
IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
SET(APPLE 1) SET(APPLE 1)
ENDIF() ENDIF()
IF(UNIX AND NOT WIN32) IF(UNIX AND NOT WIN32)
SET(CMAKE_C_FLAGS "-Wall -Wextra -Wno-unused-parameter") # additiona SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-unused-parameter")
l C compile flags # additional C compile flags
SET(CMAKE_CXX_FLAGS "-Wall -Wextra") # additional CPP compile flags SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra") # additional C
PP compile flags
ELSE() ELSE()
SET(CMAKE_C_FLAGS "-Wall -fexceptions -fident -mthreads") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -fexceptions -fident -mthreads")
SET(CMAKE_CXX_FLAGS "-Wall -Wsign-promo -fexceptions -fident -mthreads") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wsign-promo -fexceptions -f
SET(CMAKE_EXE_LINKER_FLAGS "-Wsign-promo -fexceptions -fident -mthreads -m ident -mthreads")
windows --large-address-aware") # --enable-runtime-pseudo-reloc --verbose SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wsign-promo -fexcep
tions -fident -mthreads -mwindows --large-address-aware") # --enable-runti
me-pseudo-reloc --verbose
ENDIF() ENDIF()
SET(OPTIMIZE_INTEL_ATOM 0 CACHE BOOL "Activate optimizations for atom proce ssor.") SET(OPTIMIZE_INTEL_ATOM 0 CACHE BOOL "Activate optimizations for atom proce ssor.")
IF(OPTIMIZE_INTEL_ATOM) IF(OPTIMIZE_INTEL_ATOM)
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mtune=generic -msse -msse2 -msse3 -mf pmath=sse") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mtune=generic -msse -msse2 -msse3 -mf pmath=sse")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mtune=generic -msse -msse2 -msse3 -mfpmath=sse") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mtune=generic -msse -msse2 -msse3 -mfpmath=sse")
ENDIF() ENDIF()
SET(BUILD_FOR_MAEMO 0 CACHE BOOL "Set to 1 or true if you want to build for maemo target") SET(BUILD_FOR_MAEMO 0 CACHE BOOL "Set to 1 or true if you want to build for maemo target")
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 -mmacosx-v ersion-min=10.4") 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.4") # SET(CMAKE_OSX_DEPLOYMENT_TARGET "10.5")
SET(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.4u.sdk/") # SET(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.5.sdk/")
# Universal binary # Universal binary
SET(CMAKE_OSX_ARCHITECTURES "i386;ppc") #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)
ENDIF() ENDIF()
skipping to change at line 134 skipping to change at line 135
SET(USE_PLUGIN_HELLOSTELMODULE 0 CACHE BOOL "Define whether the HelloStelMo dule plugin should be created.") SET(USE_PLUGIN_HELLOSTELMODULE 0 CACHE BOOL "Define whether the HelloStelMo dule plugin should be created.")
SET(USE_PLUGIN_ANGLEMEASURE 1 CACHE BOOL "Define whether the AngleMeasure p lugin should be created.") SET(USE_PLUGIN_ANGLEMEASURE 1 CACHE BOOL "Define whether the AngleMeasure p lugin should be created.")
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_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.")
########## 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_OCULARS)
SET(QT_USE_QTSQL TRUE)
ENDIF()
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
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
skipping to change at line 228 skipping to change at line 227
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 ")
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 SVN revision for non-release builds ########### ########### Get revision number for non-release builds ###########
IF(NOT RELEASE_BUILD) IF(NOT RELEASE_BUILD)
FIND_PACKAGE(Subversion) #Hack until CMake detection for Bazaar is finished
IF(Subversion_FOUND) IF(BZR_REVISION)
Subversion_WC_INFO(${PROJECT_SOURCE_DIR} StelSvn) SET(PACKAGE_VERSION "bzr${BZR_REVISION}")
SET(SVN_REVISION ${StelSvn_WC_REVISION}) ADD_DEFINITIONS(-DBZR_REVISION="${BZR_REVISION}")
ADD_DEFINITIONS(-DSVN_REVISION="${SVN_REVISION}") ELSE()
FIND_PACKAGE(Subversion)
IF(Subversion_FOUND)
Subversion_WC_INFO(${PROJECT_SOURCE_DIR} StelSvn)
SET(SVN_REVISION ${StelSvn_WC_REVISION})
ADD_DEFINITIONS(-DSVN_REVISION="${SVN_REVISION}")
ENDIF()
ENDIF() ENDIF()
ENDIF() ENDIF()
IF(ENABLE_STRATOSCRIPT_COMPAT) IF(ENABLE_STRATOSCRIPT_COMPAT)
ADD_DEFINITIONS(-DENABLE_STRATOSCRIPT_COMPAT) ADD_DEFINITIONS(-DENABLE_STRATOSCRIPT_COMPAT)
ENDIF() ENDIF()
### Generate an Inno Setup project file ### ### Generate an Inno Setup project file ###
IF(WIN32) IF(WIN32)
SET(CONFIGURED_FILE_WARNING "Do not edit this file! It has been automatic ally generated by CMake. Your changes will be lost the next time CMake is r un.") SET(CONFIGURED_FILE_WARNING "Do not edit this file! It has been automatic ally generated by CMake. Your changes will be lost the next time CMake is r un.")
skipping to change at line 279 skipping to change at line 284
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/" "builds/" "Stella rium.tag$" "Stellarium.kdevelop.pcs$" "~$" "\\\\.swp$" "\\\\.#" "/#") SET(CPACK_SOURCE_IGNORE_FILES "/CVS/" "/.svn/" "/.git/" "/.bzr/" "builds/ " "installers/" "Stellarium.tag$" "Stellarium.kdevelop.pcs$" "~$" "\\\\.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 ###############
ADD_CUSTOM_TARGET(apidoc doxygen Doxyfile WORKING_DIRECTORY ${PROJECT_SOURC CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/Doxyfile.cmake ${CMAKE_CURRENT_BINARY_
E_DIR} COMMENT "Generate the doxygen documentation into the builds/doc dire DIR}/Doxyfile @ONLY)
ctory.") ADD_CUSTOM_TARGET(apidoc doxygen ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile WORKI
NG_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Generate the doxygen docu
mentation into the doc directory.")
########### Top level include directories ########### ########### Top level include directories ###########
# This will be used for all compilations in sub-directories # This will be used for all compilations in sub-directories
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src
${CMAKE_SOURCE_DIR}/src/core ${CMAKE_SOURCE_DIR}/src/core
${CMAKE_SOURCE_DIR}/src/core/modules ${CMAKE_SOURCE_DIR}/src/core/modules
${CMAKE_SOURCE_DIR}/src/core/planetsephems ${CMAKE_SOURCE_DIR}/src/core/planetsephems
${CMAKE_SOURCE_DIR}/src/core/external ${CMAKE_SOURCE_DIR}/src/core/external
 End of changes. 14 change blocks. 
27 lines changed or deleted 37 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/