CMakeLists.txt   CMakeLists.txt 
skipping to change at line 24 skipping to change at line 24
IF(NOT ("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSIO N}" LESS 3.1.3)) IF(NOT ("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSIO N}" LESS 3.1.3))
CMAKE_POLICY(SET CMP0054 OLD) CMAKE_POLICY(SET CMP0054 OLD)
ENDIF() ENDIF()
########### Project name ########### ########### Project name ###########
PROJECT(Stellarium) PROJECT(Stellarium)
# Use integer versions instead of strings for easier handling if required # Use integer versions instead of strings for easier handling if required
SET(STELLARIUM_MAJOR 0) SET(STELLARIUM_MAJOR 0)
SET(STELLARIUM_MINOR 15) SET(STELLARIUM_MINOR 15)
SET(STELLARIUM_PATCH 0) SET(STELLARIUM_PATCH 1)
ADD_DEFINITIONS( ADD_DEFINITIONS(
-DSTELLARIUM_MAJOR=${STELLARIUM_MAJOR} -DSTELLARIUM_MAJOR=${STELLARIUM_MAJOR}
-DSTELLARIUM_MINOR=${STELLARIUM_MINOR} -DSTELLARIUM_MINOR=${STELLARIUM_MINOR}
-DSTELLARIUM_PATCH=${STELLARIUM_PATCH} -DSTELLARIUM_PATCH=${STELLARIUM_PATCH}
) )
SET(VERSION "${STELLARIUM_MAJOR}.${STELLARIUM_MINOR}.${STELLARIUM_PATCH}") SET(VERSION "${STELLARIUM_MAJOR}.${STELLARIUM_MINOR}.${STELLARIUM_PATCH}")
SET(PACKAGE stellarium) SET(PACKAGE stellarium)
SET(COPYRIGHT_YEARS "2000-2016") SET(COPYRIGHT_YEARS "2000-2016")
SET(PACKAGE_VERSION "${VERSION}") SET(PACKAGE_VERSION "${VERSION}")
skipping to change at line 183 skipping to change at line 183
########### Others ########### ########### Others ###########
# Activate translation # Activate translation
SET(ENABLE_NLS 1 CACHE BOOL "Define whether program translation should be s upported.") SET(ENABLE_NLS 1 CACHE BOOL "Define whether program translation should be s upported.")
IF(ENABLE_NLS) IF(ENABLE_NLS)
ADD_DEFINITIONS(-DENABLE_NLS) ADD_DEFINITIONS(-DENABLE_NLS)
ENDIF() ENDIF()
# Activate media support # Activate media support
SET(ENABLE_MEDIA 1 CACHE BOOL "Define whether media support should be activ ated.") SET(ENABLE_MEDIA 1 CACHE BOOL "Define whether media support should be activ ated.")
# SPOUT allows relaying the Stellarium OpenGL framebuffer as DirectX textur
e in other programs.
# It exists on Windows only. Syphon is a similar system for MacOS, this mig
ht be added by a Mac developer.
IF(WIN32)
SET(ENABLE_SPOUT 1 CACHE BOOL "Define whether SPOUT support should be
activated.")
ELSE()
SET(ENABLE_SPOUT 0)
ENDIF()
IF(ENABLE_SPOUT)
ADD_DEFINITIONS(-DENABLE_SPOUT)
IF("${CMAKE_SIZEOF_VOID_P}" EQUAL "4") # 32bit build?
set(SPOUT_PATH_HINT ${CMAKE_SOURCE_DIR}/util/spout2/Win32/)
ELSEIF("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") # 64bit build?
set(SPOUT_PATH_HINT ${CMAKE_SOURCE_DIR}/util/spout2/x64/)
ENDIF()
# make sure the .lib file is used, otherwise MinGW will try the .dl
l directly and fails to link
find_library(SPOUT_LIBRARY NAMES SpoutLibrary.lib SpoutLibrary PATH
S ${SPOUT_PATH_HINT})
mark_as_advanced(SPOUT_LIBRARY)
if(NOT SPOUT_LIBRARY)
message(FATAL_ERROR "Spout library not found. Try setting SPOUT
_LIBRARY or disable Spout support.")
endif()
# try to find the .dll for automatic copy
get_filename_component(SPOUT_LIBRARY_DIR ${SPOUT_LIBRARY} DIRECTORY
)
set(SPOUT_LIBRARY_DLL ${SPOUT_LIBRARY_DIR}/SpoutLibrary.dll CACHE F
ILEPATH "The path to the Spout .dll file")
if(NOT EXISTS ${SPOUT_LIBRARY_DLL})
unset(SPOUT_LIBRARY_DLL)
# try to find it with find_library (note that this does not wor
k with MSVC, but with MinGW it does, so the above manual version is necessa
ry)
find_library(SPOUT_LIBRARY_DLL SpoutLibrary.dll PATHS ${SPOUT_P
ATH_HINT})
endif()
if(NOT SPOUT_LIBRARY_DLL)
message(WARNING "Could not find SpoutLibrary.dll, you may have
to manually copy it to the binary directory.\
Try setting SPOUT_LIBRARY_DLL. Note that this is necessary
for correct installer generation.")
endif()
mark_as_advanced(SPOUT_LIBRARY_DLL)
ENDIF(ENABLE_SPOUT)
SET(ENABLE_SCRIPTING 1 CACHE BOOL "Define whether scripting features should be activated.") SET(ENABLE_SCRIPTING 1 CACHE BOOL "Define whether scripting features should be activated.")
IF(ENABLE_SCRIPTING) IF(ENABLE_SCRIPTING)
# (De-)Activate the script edit console # (De-)Activate the script edit console
SET(ENABLE_SCRIPT_CONSOLE 1 CACHE BOOL "Define whether to build the sc ript console feature.") SET(ENABLE_SCRIPT_CONSOLE 1 CACHE BOOL "Define whether to build the sc ript console feature.")
IF(ENABLE_SCRIPT_CONSOLE) IF(ENABLE_SCRIPT_CONSOLE)
ADD_DEFINITIONS(-DENABLE_SCRIPT_CONSOLE) ADD_DEFINITIONS(-DENABLE_SCRIPT_CONSOLE)
ENDIF() ENDIF()
ELSE() ELSE()
ADD_DEFINITIONS(-DDISABLE_SCRIPTING) ADD_DEFINITIONS(-DDISABLE_SCRIPTING)
ENDIF() ENDIF()
skipping to change at line 245 skipping to change at line 285
ADD_PLUGIN(LogBook 0) ADD_PLUGIN(LogBook 0)
ADD_PLUGIN(MeteorShowers 1) ADD_PLUGIN(MeteorShowers 1)
ADD_PLUGIN(NavStars 1) ADD_PLUGIN(NavStars 1)
ADD_PLUGIN(Novae 1) ADD_PLUGIN(Novae 1)
ADD_PLUGIN(Observability 1) ADD_PLUGIN(Observability 1)
ADD_PLUGIN(Oculars 1) ADD_PLUGIN(Oculars 1)
ADD_PLUGIN(PointerCoordinates 1) ADD_PLUGIN(PointerCoordinates 1)
ADD_PLUGIN(Pulsars 1) ADD_PLUGIN(Pulsars 1)
ADD_PLUGIN(Quasars 1) ADD_PLUGIN(Quasars 1)
# SOCIS 2015: # SOCIS 2015:
ADD_PLUGIN(RemoteControl 1) IF(ENABLE_SCRIPTING)
ADD_PLUGIN(RemoteControl 1)
ENDIF()
ADD_PLUGIN(RemoteSync 0) ADD_PLUGIN(RemoteSync 0)
ADD_PLUGIN(Satellites 1) ADD_PLUGIN(Satellites 1)
ADD_PLUGIN(Scenery3d 1) ADD_PLUGIN(Scenery3d 1)
ADD_PLUGIN(SolarSystemEditor 1) ADD_PLUGIN(SolarSystemEditor 1)
ADD_PLUGIN(Supernovae 1) ADD_PLUGIN(Supernovae 1)
ADD_PLUGIN(TextUserInterface 1) ADD_PLUGIN(TextUserInterface 1)
ADD_PLUGIN(TelescopeControl 1) ADD_PLUGIN(TelescopeControl 1)
ADD_PLUGIN(TimeZoneConfiguration 1)
########## 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(USE_PLUGIN_LOGBOOK) IF(USE_PLUGIN_LOGBOOK)
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()
# 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
skipping to change at line 334 skipping to change at line 375
ELSE() ELSE()
ADD_DEFINITIONS(-DINSTALL_DATADIR="${CMAKE_INSTALL_PREFIX}/share/st ellarium") ADD_DEFINITIONS(-DINSTALL_DATADIR="${CMAKE_INSTALL_PREFIX}/share/st ellarium")
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): # Used in generating the documentation (doc/stellarium.pod.cmake):
SET(INSTALL_DATADIR "${CMAKE_INSTALL_PREFIX}/share/stellarium") 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()
# For not installed debug builds with build directory path that not match s
ources directory path ${PROJECT_BINARY_DIR} != ${CMAKE_SOURCE_DIR}
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
ADD_DEFINITIONS(-DINSTALL_DATADIR_FOR_DEBUG="${CMAKE_SOURCE_DIR}")
ADD_DEFINITIONS(-DINSTALL_LOCALEDIR_FOR_DEBUG="${CMAKE_SOURCE_DIR}")
endif()
########### Get revision number for non-release builds ########### ########### Get revision number for non-release builds ###########
IF(NOT STELLARIUM_RELEASE_BUILD) IF(NOT STELLARIUM_RELEASE_BUILD)
# Hack until CMake detection for Bazaar is finished # Hack until CMake detection for Bazaar is finished
EXECUTE_PROCESS(COMMAND bzr revno WORKING_DIRECTORY ${CMAKE_CURRENT_SOU RCE_DIR} TIMEOUT 30 OUTPUT_VARIABLE BZR_REVISION OUTPUT_STRIP_TRAILING_WHIT ESPACE ERROR_VARIABLE BZR_ERROR) EXECUTE_PROCESS(COMMAND bzr revno --tree WORKING_DIRECTORY ${CMAKE_CURR ENT_SOURCE_DIR} TIMEOUT 30 OUTPUT_VARIABLE BZR_REVISION OUTPUT_STRIP_TRAILI NG_WHITESPACE ERROR_VARIABLE BZR_ERROR)
EXECUTE_PROCESS(COMMAND bzr version-info --custom --template={branch_ni ck} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} TIMEOUT 30 OUTPUT_VARIABL E BZR_BRANCH OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE BZR_ERROR) EXECUTE_PROCESS(COMMAND bzr version-info --custom --template={branch_ni ck} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} TIMEOUT 30 OUTPUT_VARIABL E BZR_BRANCH OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE BZR_ERROR)
IF(BZR_REVISION) IF(BZR_REVISION)
SET(PACKAGE_VERSION "${VERSION}.${BZR_REVISION}") SET(PACKAGE_VERSION "${VERSION}.${BZR_REVISION}")
ADD_DEFINITIONS(-DBZR_REVISION="${BZR_REVISION}") ADD_DEFINITIONS(-DBZR_REVISION="${BZR_REVISION}")
ADD_DEFINITIONS(-DBZR_BRANCH="${BZR_BRANCH}") ADD_DEFINITIONS(-DBZR_BRANCH="${BZR_BRANCH}")
ENDIF() ENDIF()
# MESSAGE(STATUS "Branch: ${BZR_BRANCH}; Revision: ${BZR_REVISION}; Err or: ${BZR_ERROR}") # MESSAGE(STATUS "Branch: ${BZR_BRANCH}; Revision: ${BZR_REVISION}; Err or: ${BZR_ERROR}")
IF(STELLARIUM_VERSION) IF(STELLARIUM_VERSION)
SET(PACKAGE_VERSION "${STELLARIUM_VERSION}") SET(PACKAGE_VERSION "${STELLARIUM_VERSION}")
ADD_DEFINITIONS(-DSTELLARIUM_VERSION="${STELLARIUM_VERSION}") ADD_DEFINITIONS(-DSTELLARIUM_VERSION="${STELLARIUM_VERSION}")
skipping to change at line 482 skipping to change at line 528
ENDIF() ENDIF()
SET(ISS_ICU_LIBS "; ICU support\nSource: \"${QT5_LIBS}/icu*.dll\"; Dest Dir: \"{app}\";") SET(ISS_ICU_LIBS "; ICU support\nSource: \"${QT5_LIBS}/icu*.dll\"; Dest Dir: \"{app}\";")
# Deploy related stuff # Deploy related stuff
SET(ISS_QT_PLUGINS "; Qt plugins") SET(ISS_QT_PLUGINS "; Qt plugins")
SET(ISS_QT_PLUGINS "${ISS_QT_PLUGINS}\nSource: \"${QT5_LIBS}/../plugins /platforms/qwindows.dll\"; DestDir: \"{app}/platforms/\";") SET(ISS_QT_PLUGINS "${ISS_QT_PLUGINS}\nSource: \"${QT5_LIBS}/../plugins /platforms/qwindows.dll\"; DestDir: \"{app}/platforms/\";")
SET(ISS_QT_PLUGINS "${ISS_QT_PLUGINS}\nSource: \"${QT5_LIBS}/../plugins /imageformats/qico.dll\"; DestDir: \"{app}/imageformats/\";") SET(ISS_QT_PLUGINS "${ISS_QT_PLUGINS}\nSource: \"${QT5_LIBS}/../plugins /imageformats/qico.dll\"; DestDir: \"{app}/imageformats/\";")
SET(ISS_QT_PLUGINS "${ISS_QT_PLUGINS}\nSource: \"${QT5_LIBS}/../plugins /imageformats/qjpeg.dll\"; DestDir: \"{app}/imageformats/\";") SET(ISS_QT_PLUGINS "${ISS_QT_PLUGINS}\nSource: \"${QT5_LIBS}/../plugins /imageformats/qjpeg.dll\"; DestDir: \"{app}/imageformats/\";")
IF(ENABLE_MEDIA) IF(ENABLE_MEDIA)
SET(ISS_QT_PLUGINS "${ISS_QT_PLUGINS}\nSource: \"${QT5_LIBS}/../plug ins/mediaservice/dsengine.dll\"; DestDir: \"{app}/mediaservice/\";\nSource: \"${QT5_LIBS}/../plugins/mediaservice/qtmedia_audioengine.dll\"; DestDir: \"{app}/mediaservice/\";\nSource: \"${QT5_LIBS}/../plugins/playlistformats/ qtmultimedia_m3u.dll\"; DestDir: \"{app}/playlistformats/\";") SET(ISS_QT_PLUGINS "${ISS_QT_PLUGINS}\nSource: \"${QT5_LIBS}/../plug ins/mediaservice/dsengine.dll\"; DestDir: \"{app}/mediaservice/\";\nSource: \"${QT5_LIBS}/../plugins/mediaservice/qtmedia_audioengine.dll\"; DestDir: \"{app}/mediaservice/\";\nSource: \"${QT5_LIBS}/../plugins/playlistformats/ qtmultimedia_m3u.dll\"; DestDir: \"{app}/playlistformats/\";")
ENDIF() ENDIF()
ENDIF() IF(ENABLE_SPOUT)
IF(SPOUT_LIBRARY_DLL) # we know the dll
SET(ISS_QT_PLUGINS "${ISS_QT_PLUGINS}\nSource: \"${SPOUT_LIBRAR
Y_DLL}\"; DestDir: \"{app}\";")
ENDIF()
ENDIF(ENABLE_SPOUT)
ENDIF(WIN32)
IF(CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "RelWit hDebInfo") IF(CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "RelWit hDebInfo")
ADD_DEFINITIONS(-DQT_NO_DEBUG) ADD_DEFINITIONS(-DQT_NO_DEBUG)
ADD_DEFINITIONS(-DNDEBUG) ADD_DEFINITIONS(-DNDEBUG)
ENDIF() ENDIF()
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake/default_config.ini.cmake ${CMAKE_S OURCE_DIR}/data/default_config.ini @ONLY) CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake/default_config.ini.cmake ${CMAKE_S OURCE_DIR}/data/default_config.ini @ONLY)
########### uninstall files ############### ########### uninstall files ###############
CONFIGURE_FILE( CONFIGURE_FILE(
 End of changes. 7 change blocks. 
5 lines changed or deleted 72 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/