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 "2") SET(STELLARIUM_PATCH "3")
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 ###########
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 GProf Valgrind Release RelWithDebInfo MinSizeRel." FORC E)
ENDIF() ENDIF()
# Add gprof build options if necessary. Note gmon.out will be created in w
orking directory when Stellarium is executed
IF(${CMAKE_BUILD_TYPE} MATCHES "GProf")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fprofile-arcs")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs")
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pg")
ENDIF()
# Add valgrind build options if necessary
IF(${CMAKE_BUILD_TYPE} MATCHES "Valgrind")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0")
SET(CMAEK_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0")
ENDIF()
IF(NOT STELLARIUM_SPLASH)
SET(STELLARIUM_SPLASH Development CACHE STRING "Choose the type of Stellar
ium's splash image, options are: Release Development ReleaseCandidate." FOR
CE)
ENDIF()
ADD_DEFINITIONS(-DSTELLARIUM_SPLASH="${STELLARIUM_SPLASH}")
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 "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-unused-parameter") # additional C compile flags SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-unused-parameter") # additional C compile flags
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra") # additional C PP compile flags SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra") # additional C PP compile flags
ELSE() ELSEIF ("${CMAKE_SIZEOF_VOID_P}" EQUAL "4")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -fexceptions -fident -mthreads") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -fexceptions -fident -mthreads")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wsign-promo -fexceptions -f ident -mthreads") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wsign-promo -fexceptions -f ident -mthreads")
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 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
ELSEIF ("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -fexceptions -fident -mthreads")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wsign-promo -fexceptions -f
ident -mthreads")
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wsign-promo -fexcep
tions -fident -mthreads -mwindows") # --enable-runtime-pseudo-reloc --verb
ose
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)
skipping to change at line 72 skipping to change at line 94
#SET(CMAKE_OSX_DEPLOYMENT_TARGET "10.5") #SET(CMAKE_OSX_DEPLOYMENT_TARGET "10.5")
#SET(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.5.sdk/") #SET(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.5.sdk/")
#SET(CMAKE_OSX_DEPLOYMENT_TARGET "10.6") #SET(CMAKE_OSX_DEPLOYMENT_TARGET "10.6")
#SET(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.6.sdk/") #SET(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.6.sdk/")
# uncomment one of the following, depending on what platforms you want. # 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 # NOTE: Qt build for Cocoa is Intel only. Qt with Carbon is both, but doe s not seem
# to handle 64bit well. # to handle 64bit well.
#SET(CMAKE_OSX_ARCHITECTURES "i386;x86_64;ppc;ppc64") #SET(CMAKE_OSX_ARCHITECTURES "i386;x86_64;ppc;ppc64")
#SET(CMAKE_OSX_ARCHITECTURES "i386;x86_64") #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)
ENDIF() ENDIF()
skipping to change at line 186 skipping to change at line 208
SET(QT_USE_QTSQL TRUE) # For LogBook we also need SQL module SET(QT_USE_QTSQL TRUE) # For LogBook we also need SQL module
ENDIF() 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.2")
FIND_PACKAGE(Qt4 REQUIRED) FIND_PACKAGE(Qt4 REQUIRED)
SET(QT_USE_QTOPENGL TRUE) SET(QT_USE_QTOPENGL TRUE)
IF(ENABLE_SCRIPTING) IF(ENABLE_SCRIPTING)
SET(QT_USE_QTSCRIPT TRUE) SET(QT_USE_QTSCRIPT TRUE)
ENDIF() ENDIF()
SET(QT_USE_QTNETWORK TRUE) SET(QT_USE_QTNETWORK TRUE)
SET(QT_USE_QTTEST TRUE) SET(QT_USE_QTTEST TRUE)
IF(ENABLE_SOUND) IF(ENABLE_SOUND)
ADD_DEFINITIONS(-DHAVE_QT_PHONON) ADD_DEFINITIONS(-DHAVE_QT_PHONON)
SET(QT_USE_PHONON TRUE) SET(QT_USE_PHONON TRUE)
ENDIF() ENDIF()
INCLUDE(${QT_USE_FILE}) INCLUDE(${QT_USE_FILE})
# Get rid of the QtTest dependency for the main binary. It is re-added manu ally when compiling tests. # Get rid of the QtTest dependency for the main binary. It is re-added manu ally when compiling tests.
STRING(REPLACE "${QT_QTTEST_LIBRARY}" "" QT_LIBRARIES "${QT_LIBRARIES}") STRING(REPLACE "${QT_QTTEST_LIBRARY}" "" QT_LIBRARIES "${QT_LIBRARIES}")
# Get rid of the GLU dependency, it's not needed in stellarium. # Get rid of the GLU dependency, it's not needed in stellarium.
STRING(REPLACE "-lGLU " "" QT_LIBRARIES "${QT_LIBRARIES}") STRING(REPLACE "-lGLU " "" QT_LIBRARIES "${QT_LIBRARIES}")
FIND_PACKAGE(OpenGL) # Introduced in revision 5284, may cause problems when compiling in OpenGL ES mode - see lines 248-255 below. --BM
FIND_PACKAGE(ZLIB) FIND_PACKAGE(ZLIB)
IF(ENABLE_NLS) IF(ENABLE_NLS)
FIND_PACKAGE(Iconv REQUIRED) FIND_PACKAGE(Iconv REQUIRED)
FIND_PATH(INTL_INCLUDE_DIR libintl.h FIND_PATH(INTL_INCLUDE_DIR libintl.h
PATHS PATHS
/usr/include /usr/include
/sw/include /sw/include
/usr/local/include) /usr/local/include)
FIND_LIBRARY(INTL_LIBRARIES intl c FIND_LIBRARY(INTL_LIBRARIES intl c
skipping to change at line 331 skipping to change at line 354
${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
${CMAKE_SOURCE_DIR}/src/core/external/kfilter ${CMAKE_SOURCE_DIR}/src/core/external/kfilter
${CMAKE_SOURCE_DIR}/src/core/external/glues_stel/source/ ${CMAKE_SOURCE_DIR}/src/core/external/glues_stel/source/
${CMAKE_SOURCE_DIR}/src/core/external/glues_stel/source/libtess ${CMAKE_SOURCE_DIR}/src/core/external/glues_stel/source/libtess
${CMAKE_SOURCE_DIR}/src/gui ${CMAKE_SOURCE_DIR}/src/gui
${CMAKE_SOURCE_DIR}/src/scripting ${CMAKE_SOURCE_DIR}/src/scripting
${OPENGL_INCLUDE_DIR}
${ICONV_INCLUDE_DIR}
${INTL_INCLUDE_DIR} ${INTL_INCLUDE_DIR}
${ZLIB_INCLUDE_DIR}
${QT_INCLUDE_DIR}/QtScript
${QT_QTSCRIPT_INCLUDE_DIR}
${CMAKE_BINARY_DIR}/src ${CMAKE_BINARY_DIR}/src
${QT_QTTEST_INCLUDE_DIR}
${QT_DECLARATIVE_INCLUDE_DIR}
) )
########### Subdirectories ############### ########### Subdirectories ###############
ADD_SUBDIRECTORY( data ) ADD_SUBDIRECTORY( data )
ADD_SUBDIRECTORY( src ) ADD_SUBDIRECTORY( src )
ADD_SUBDIRECTORY( textures ) ADD_SUBDIRECTORY( textures )
ADD_SUBDIRECTORY( doc ) ADD_SUBDIRECTORY( doc )
IF(ENABLE_NLS) IF(ENABLE_NLS)
ADD_SUBDIRECTORY( po ) ADD_SUBDIRECTORY( po )
ENDIF() ENDIF()
 End of changes. 11 change blocks. 
12 lines changed or deleted 34 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/