CMakeLists.txt   CMakeLists.txt 
skipping to change at line 26 skipping to change at line 26
CMAKE_POLICY(SET CMP0054 OLD) CMAKE_POLICY(SET CMP0054 OLD)
ENDIF() ENDIF()
# warn about deprecated stuff so that we may try fixing it # warn about deprecated stuff so that we may try fixing it
SET(CMAKE_WARN_DEPRECATED 1) SET(CMAKE_WARN_DEPRECATED 1)
########### 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 16)
SET(STELLARIUM_PATCH 2) SET(STELLARIUM_PATCH 0)
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-2017") SET(COPYRIGHT_YEARS "2000-2017")
SET(PACKAGE_VERSION "${VERSION}") SET(PACKAGE_VERSION "${VERSION}")
ADD_DEFINITIONS(-DPACKAGE_VERSION="${PACKAGE_VERSION}") ADD_DEFINITIONS(-DPACKAGE_VERSION="${PACKAGE_VERSION}")
ADD_DEFINITIONS(-DCOPYRIGHT_YEARS="${COPYRIGHT_YEARS}") ADD_DEFINITIONS(-DCOPYRIGHT_YEARS="${COPYRIGHT_YEARS}")
# Write version of Stellarium to Stellarium User Guide # Write version of Stellarium to Stellarium User Guide
CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/cmake/version.tex.cmake ${PROJECT_SOUR CE_DIR}/guide/version.tex @ONLY NEWLINE_STYLE LF) CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/cmake/version.tex.cmake ${PROJECT_SOUR CE_DIR}/guide/version.tex @ONLY NEWLINE_STYLE LF)
# currently Qt 5.4 - 5.6 is recommended, we can still build with Qt 5.3, an # currently Qt 5.4 - 5.6 is recommended, we can no longer build with Qt 5.3
d 5.7 may have some bugs , and 5.7 may have some bugs (on Mac? 5.7 is fine on Windows) 5.8 on Window
SET(MINIMAL_QT_VERSION "5.3.0") s seems OK.
SET(MINIMAL_QT_VERSION "5.4.0")
# Use customized cmake macros # Use customized cmake macros
SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/modules)
# Show platform info # Show platform info
MESSAGE(STATUS "Platform: ${CMAKE_SYSTEM}") MESSAGE(STATUS "Platform: ${CMAKE_SYSTEM}")
########### 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, o ptions are: None Debug GProf Valgrind Release RelWithDebInfo MinSizeRel." F ORCE) SET(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build, o ptions are: None Debug GProf Valgrind Release RelWithDebInfo MinSizeRel." F ORCE)
ENDIF() ENDIF()
SET(STELLARIUM_RELEASE_BUILD 1 CACHE BOOL "Set 1 to build as an official re lease (0 for development snapshots).") SET(STELLARIUM_RELEASE_BUILD 1 CACHE BOOL "Set 1 to build as an official re lease (0 for development snapshots).")
skipping to change at line 132 skipping to change at line 132
# Let CMake handle setting C++11 (since 3.1) # Let CMake handle setting C++11 (since 3.1)
SET(CMAKE_CXX_STANDARD 11) SET(CMAKE_CXX_STANDARD 11)
ELSE() ELSE()
# Add std=c++11 to gcc flags # Add std=c++11 to gcc flags
SET(STEL_GCC_CXX_FLAGS "-std=c++11 ${STEL_GCC_CXX_FLAGS}") SET(STEL_GCC_CXX_FLAGS "-std=c++11 ${STEL_GCC_CXX_FLAGS}")
ENDIF() ENDIF()
ENDIF() ENDIF()
IF(WIN32) IF(WIN32)
# We don't need the extra Windows.h stuff, this may speed up compilati
on a tiny bit
# This should also prevent some Winsock.h warnings
ADD_DEFINITIONS(-DWIN32_LEAN_AND_MEAN)
IF(NOT MSVC) IF(NOT MSVC)
# MinGW requires enabling of exceptions, version number storage a nd MinGW-specific threading # MinGW requires enabling of exceptions, version number storage a nd MinGW-specific threading
SET(STEL_MINGW_FLAGS "-fexceptions -fident -mthreads") SET(STEL_MINGW_FLAGS "-fexceptions -fident -mthreads")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${STEL_GCC_C_FLAGS} ${STEL_MI NGW_FLAGS}") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${STEL_GCC_C_FLAGS} ${STEL_MI NGW_FLAGS}")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${STEL_GCC_CXX_FLAGS} ${S TEL_MINGW_FLAGS}") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${STEL_GCC_CXX_FLAGS} ${S TEL_MINGW_FLAGS}")
# -mwindows generates a windows GUI app
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${STEL_MING
W_FLAGS} -mwindows")
ELSE() # MSVC ELSE() # MSVC
# Additional flags:
# Disabled warnings
# C4244: implicit type conversion to a smaller type
# C4305: type truncation
# C4351: "new" behaviour, member array default initialization. Re
quired since at least C++98, but funny MSVC throws a warning.
# C4996: deprecated POSIX names (used in zlib)
SET(STEL_MSVC_FLAGS "/wd4244 /wd4305 /wd4351 /wd4996")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${STEL_MSVC_FLAGS}")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${STEL_MSVC_FLAGS}")
# Additional defines:
# NOMINMAX So that windows.h does not redefine min and max # NOMINMAX So that windows.h does not redefine min and max
# _WINSOCKAPI_ Prevent window.s from including winsock.h # _CRT_SECURE_NO_WARNINGS Removes warnings about using "insecure"
ADD_DEFINITIONS(-DNOMINMAX -D_WINSOCKAPI_ /D_CRT_SECURE_NO_WARNIN C standard functions like scanf instead of MSVC-specific ones
GS /wd4244 /wd4005 /wd4101 /wd4996 /wd4305 /wd4805) ADD_DEFINITIONS(-DNOMINMAX -D_CRT_SECURE_NO_WARNINGS)
ENDIF() ENDIF()
ELSE() ELSE()
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${STEL_GCC_C_FLAGS}") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${STEL_GCC_C_FLAGS}")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${STEL_GCC_CXX_FLAGS}") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${STEL_GCC_CXX_FLAGS}")
ENDIF() ENDIF()
# CMake 3.0.0 the CMAKE_<LANG>_COMPILER_ID value for Apple-provided Clang i s now AppleClang # CMake 3.0.0 the CMAKE_<LANG>_COMPILER_ID value for Apple-provided Clang i s now AppleClang
IF("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") IF("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
# using regular Clang or AppleClang # using regular Clang or AppleClang
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wno-unus ed-private-field -Wno-uninitialized -Wno-tautological-constant-out-of-range -compare") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wno-unus ed-private-field -Wno-uninitialized -Wno-tautological-constant-out-of-range -compare")
skipping to change at line 199 skipping to change at line 210
########### 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.")
# Activate GPS support. Solution depends on operating system:
# - Windows: Only directly-attached serial NMEA emitter.
# - Other systems: libgps if possible and NMEA emitter as fallback.
SET(ENABLE_GPS 1 CACHE BOOL "Define whether GPS queries should be supported
.")
# SPOUT allows relaying the Stellarium OpenGL framebuffer as DirectX textur e in other programs. # 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. # It exists on Windows only. Syphon is a similar system for MacOS, this mig ht be added by a Mac developer.
IF(WIN32) IF(WIN32)
IF(${CMAKE_SYSTEM_VERSION} LESS 6.1 ) # Need Windows 7 to enable suppo rt of Spout IF(${CMAKE_SYSTEM_VERSION} LESS 6.1 ) # Need Windows 7 to enable suppo rt of Spout
SET(ENABLE_SPOUT 0) SET(ENABLE_SPOUT 0)
MESSAGE(STATUS "Spout support disabled due to operating system re quirement") MESSAGE(STATUS "Spout support disabled due to operating system re quirement")
ELSE() ELSE()
SET(ENABLE_SPOUT 1 CACHE BOOL "Define whether SPOUT support shoul d be activated.") SET(ENABLE_SPOUT 1 CACHE BOOL "Define whether SPOUT support shoul d be activated.")
ENDIF() ENDIF()
ELSE() ELSE()
skipping to change at line 310 skipping to change at line 326
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)
IF(ENABLE_SCRIPTING) IF(ENABLE_SCRIPTING)
ADD_PLUGIN(RemoteControl 1) ADD_PLUGIN(RemoteControl 1)
ENDIF() ENDIF()
ADD_PLUGIN(RemoteSync 0) ADD_PLUGIN(RemoteSync 1)
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)
########## 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
skipping to change at line 332 skipping to change at line 348
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
ADD_CUSTOM_TARGET(AllStaticPlugins ALL) ADD_CUSTOM_TARGET(AllStaticPlugins ALL)
########### Find packages ########### ########### Find packages ###########
FIND_PACKAGE(Qt5Core REQUIRED) FIND_PACKAGE(Qt5Core REQUIRED)
GET_TARGET_PROPERTY(QMAKE_LOCATION Qt5::qmake LOCATION) GET_TARGET_PROPERTY(QMAKE_LOCATION Qt5::qmake LOCATION)
IF(${Qt5Core_VERSION_STRING} VERSION_LESS MINIMAL_QT_VERSION) IF(${Qt5Core_VERSION} VERSION_LESS MINIMAL_QT_VERSION)
MESSAGE(FATAL_ERROR "Found Qt5: ${QMAKE_LOCATION} (found unsuitable ve MESSAGE(FATAL_ERROR "Found Qt5: ${QMAKE_LOCATION} (found unsuitable ve
rsion \"${Qt5Core_VERSION_STRING}\", required is \"${MINIMAL_QT_VERSION}\") rsion \"${Qt5Core_VERSION}\", required is \"${MINIMAL_QT_VERSION}\")")
")
ELSE() ELSE()
MESSAGE(STATUS "Found Qt5: ${QMAKE_LOCATION} (found suitable version \ "${Qt5Core_VERSION_STRING}\")") MESSAGE(STATUS "Found Qt5: ${QMAKE_LOCATION} (found suitable version \ "${Qt5Core_VERSION}\")")
ENDIF() ENDIF()
FIND_PACKAGE(Qt5Concurrent REQUIRED) FIND_PACKAGE(Qt5Concurrent REQUIRED)
FIND_PACKAGE(Qt5Gui REQUIRED) FIND_PACKAGE(Qt5Gui REQUIRED)
FIND_PACKAGE(Qt5Network REQUIRED) FIND_PACKAGE(Qt5Network REQUIRED)
FIND_PACKAGE(Qt5Widgets REQUIRED) FIND_PACKAGE(Qt5Widgets REQUIRED)
# required for qcustomplot external dependency # required for qcustomplot external dependency
# not used elsewhere # not used elsewhere
FIND_PACKAGE(Qt5PrintSupport REQUIRED) FIND_PACKAGE(Qt5PrintSupport REQUIRED)
IF(USE_PLUGIN_TELESCOPECONTROL) IF(USE_PLUGIN_TELESCOPECONTROL OR ENABLE_GPS)
FIND_PACKAGE(Qt5SerialPort REQUIRED) FIND_PACKAGE(Qt5SerialPort REQUIRED)
ENDIF() ENDIF()
IF(WIN32) IF(WIN32)
FIND_PACKAGE(Qt5Sql REQUIRED) FIND_PACKAGE(Qt5Sql REQUIRED)
FIND_PACKAGE(Qt5XmlPatterns REQUIRED) FIND_PACKAGE(Qt5XmlPatterns REQUIRED)
# Try found OpenSSL DLL's on Windows # Try found OpenSSL DLL's on Windows
FIND_FILE(OPENSSL_SSLEAY32_LIBRARY_DLL ssleay32.dll) FIND_FILE(OPENSSL_SSLEAY32_LIBRARY_DLL ssleay32.dll)
FIND_FILE(OPENSSL_LIBEAY32_LIBRARY_DLL libeay32.dll) FIND_FILE(OPENSSL_LIBEAY32_LIBRARY_DLL libeay32.dll)
FIND_FILE(OPENSSL_LIBSSL32_LIBRARY_DLL libssl32.dll) FIND_FILE(OPENSSL_LIBSSL32_LIBRARY_DLL libssl32.dll)
skipping to change at line 379 skipping to change at line 395
IF(EXISTS ${OPENSSL_LICENSE}) IF(EXISTS ${OPENSSL_LICENSE})
MESSAGE(STATUS "Found OpenSSL license: ${OPENSSL_LICENSE}") MESSAGE(STATUS "Found OpenSSL license: ${OPENSSL_LICENSE}")
SET(ISS_OPENSSL_LIBS "${ISS_OPENSSL_LIBS}\nSource: \"${OPENSSL_LI CENSE}\"; DestDir: \"{app}\";") SET(ISS_OPENSSL_LIBS "${ISS_OPENSSL_LIBS}\nSource: \"${OPENSSL_LI CENSE}\"; DestDir: \"{app}\";")
ENDIF() ENDIF()
IF((NOT EXISTS ${OPENSSL_SSLEAY32_LIBRARY_DLL}) AND (NOT EXISTS ${OPEN SSL_LIBEAY32_LIBRARY_DLL})) IF((NOT EXISTS ${OPENSSL_SSLEAY32_LIBRARY_DLL}) AND (NOT EXISTS ${OPEN SSL_LIBEAY32_LIBRARY_DLL}))
SET(ISS_OPENSSL_LIBS "; OpenSSL libraries isn't found") SET(ISS_OPENSSL_LIBS "; OpenSSL libraries isn't found")
ENDIF() ENDIF()
ENDIF() ENDIF()
# when using Qt 5.3, default to using the old QGLWidget, but warn # when using Qt 5.3, default to using the old QGLWidget, but warn
IF(${Qt5Core_VERSION_STRING} VERSION_LESS "5.4") IF(${Qt5Core_VERSION} VERSION_LESS "5.4")
SET(USE_OLD_QGLWIDGET 1) SET(USE_OLD_QGLWIDGET 1)
MESSAGE(WARNING "You are using Qt ${Qt5Core_VERSION_STRING} to build, falling back to legacy QGLWidget rendering. Consider using at least Qt 5.4 if possible.") MESSAGE(WARNING "You are using Qt ${Qt5Core_VERSION} to build, falling back to legacy QGLWidget rendering. Consider using at least Qt 5.4 if poss ible.")
ELSE() ELSE()
# offer the old widget as an alternative, default off # offer the old widget as an alternative, default off
SET(USE_OLD_QGLWIDGET 0 CACHE BOOL "Use the legacy QGLWidget instead o f the new QOpenGLWidget for the main viewport, and link to the QtOpenGL mod ule") SET(USE_OLD_QGLWIDGET 0 CACHE BOOL "Use the legacy QGLWidget instead o f the new QOpenGLWidget for the main viewport, and link to the QtOpenGL mod ule")
ENDIF() ENDIF()
IF(USE_OLD_QGLWIDGET) IF(USE_OLD_QGLWIDGET)
SET(USE_QTOPENGL 1) SET(USE_QTOPENGL 1)
ADD_DEFINITIONS(-DUSE_OLD_QGLWIDGET) ADD_DEFINITIONS(-DUSE_OLD_QGLWIDGET)
ENDIF() ENDIF()
skipping to change at line 418 skipping to change at line 434
ENDIF() ENDIF()
# Tell CMake to run moc when necessary: # Tell CMake to run moc when necessary:
set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOMOC ON)
# As moc files are generated in the binary dir, tell CMake to always look f or includes there: # As moc files are generated in the binary dir, tell CMake to always look f or includes there:
SET(CMAKE_INCLUDE_CURRENT_DIR ON) SET(CMAKE_INCLUDE_CURRENT_DIR ON)
IF(ENABLE_SCRIPTING) IF(ENABLE_SCRIPTING)
FIND_PACKAGE(Qt5Script REQUIRED) FIND_PACKAGE(Qt5Script REQUIRED)
ENDIF() ENDIF()
IF(ENABLE_MEDIA) IF(ENABLE_MEDIA)
SET(USE_QTOPENGL 1) SET(USE_QTOPENGL 1)
ADD_DEFINITIONS(-DENABLE_MEDIA) ADD_DEFINITIONS(-DENABLE_MEDIA)
FIND_PACKAGE(Qt5Multimedia REQUIRED) FIND_PACKAGE(Qt5Multimedia REQUIRED)
FIND_PACKAGE(Qt5MultimediaWidgets REQUIRED) FIND_PACKAGE(Qt5MultimediaWidgets REQUIRED)
ENDIF() ENDIF()
IF(ENABLE_GPS)
MESSAGE(STATUS "GPS: support by Qt's NMEA handling enabled.")
FIND_PACKAGE(Qt5Positioning REQUIRED)
ADD_DEFINITIONS(-DENABLE_GPS)
IF(WIN32)
SET(ENABLE_LIBGPS 0)
ELSE(WIN32)
FIND_PACKAGE(GPS QUIET)
IF(GPS_FOUND)
SET(ENABLE_LIBGPS 1)
ADD_DEFINITIONS(-DENABLE_LIBGPS)
MESSAGE(STATUS "GPS: Using GPS library at ${GPS_LIBRARY}")
ELSE(GPS_FOUND)
SET(ENABLE_LIBGPS 0)
MESSAGE(STATUS "GPS: Could not find GPS library - GPSD query
disabled!")
ENDIF(GPS_FOUND)
ENDIF(WIN32)
ELSE(ENABLE_GPS)
SET(ENABLE_LIBGPS 0)
ENDIF(ENABLE_GPS)
IF(USE_QTOPENGL) IF(USE_QTOPENGL)
# QtOpenGL module is deprecated. After merging the QOpenGLWidget branc h, we don't use this module directly anymore, # QtOpenGL module is deprecated. After merging the QOpenGLWidget branc h, we don't use this module directly anymore,
# but the QtMultimediaWidgets module requires it internally, so we sti ll have to package it. # but the QtMultimediaWidgets module requires it internally, so we sti ll have to package it.
FIND_PACKAGE(Qt5OpenGL REQUIRED) FIND_PACKAGE(Qt5OpenGL REQUIRED)
ENDIF() ENDIF()
FIND_PACKAGE(Qt5Test) FIND_PACKAGE(Qt5Test)
### Setup external packages ### Zlib package
FIND_PACKAGE(ZLIB QUIET) #quiet warnings about not found, we have our own v ersion anyway FIND_PACKAGE(ZLIB QUIET) #quiet warnings about not found, we have our own v ersion anyway
# if a system zlib is found, let the user choose if to instead use our bund led version # if a system zlib is found, let the user choose if to instead use our bund led version
IF(ZLIB_FOUND) IF(ZLIB_FOUND)
IF(WIN32) #on win, we default to "no" IF(WIN32) #on win, we default to "no"
SET(USE_SYSTEM_ZLIB 0 CACHE BOOL "Use system-provided zlib instea d of the bundled version") SET(USE_SYSTEM_ZLIB 0 CACHE BOOL "Use system-provided zlib instea d of the bundled version")
ELSE() #else, we default to "yes" ELSE() #else, we default to "yes"
SET(USE_SYSTEM_ZLIB 1 CACHE BOOL "Use system-provided zlib instea d of the bundled version") SET(USE_SYSTEM_ZLIB 1 CACHE BOOL "Use system-provided zlib instea d of the bundled version")
ENDIF() ENDIF()
ELSE() ELSE()
skipping to change at line 586 skipping to change at line 623
GET_TARGET_PROPERTY(QtSql_location Qt5::Sql LOCATION) GET_TARGET_PROPERTY(QtSql_location Qt5::Sql LOCATION)
GET_TARGET_PROPERTY(QtXmlPatterns_location Qt5::XmlPatterns LOCATION) GET_TARGET_PROPERTY(QtXmlPatterns_location Qt5::XmlPatterns LOCATION)
GET_TARGET_PROPERTY(QtPrintSupport_location Qt5::PrintSupport LOCATION ) GET_TARGET_PROPERTY(QtPrintSupport_location Qt5::PrintSupport LOCATION )
SET(ISS_QT_PRINTSUPPORT "Source: \"${QtPrintSupport_location}\"; DestD ir: \"{app}\";") SET(ISS_QT_PRINTSUPPORT "Source: \"${QtPrintSupport_location}\"; DestD ir: \"{app}\";")
IF(ENABLE_SCRIPTING) IF(ENABLE_SCRIPTING)
GET_TARGET_PROPERTY(QtScript_location Qt5::Script LOCATION) GET_TARGET_PROPERTY(QtScript_location Qt5::Script LOCATION)
SET(ISS_QT_SCRIPT "Source: \"${QtScript_location}\"; DestDir: \"{ app}\";") SET(ISS_QT_SCRIPT "Source: \"${QtScript_location}\"; DestDir: \"{ app}\";")
ELSE() ELSE()
SET(ISS_QT_SCRIPT "; QtScript isn't used") SET(ISS_QT_SCRIPT "; QtScript isn't used")
ENDIF() ENDIF()
IF(USE_PLUGIN_TELESCOPECONTROL) IF(USE_PLUGIN_TELESCOPECONTROL OR ENABLE_GPS)
GET_TARGET_PROPERTY(QtSerialPort_location Qt5::SerialPort LOCATIO N) GET_TARGET_PROPERTY(QtSerialPort_location Qt5::SerialPort LOCATIO N)
SET(ISS_QT_SERIALPORT "Source: \"${QtSerialPort_location}\"; Dest Dir: \"{app}\";") SET(ISS_QT_SERIALPORT "Source: \"${QtSerialPort_location}\"; Dest Dir: \"{app}\";")
ELSE() ELSE()
SET(ISS_QT_SERIALPORT "; QtSerialPort isn't used") SET(ISS_QT_SERIALPORT "; QtSerialPort isn't used")
ENDIF() ENDIF()
IF(ENABLE_GPS)
GET_TARGET_PROPERTY(QtPositioning_location Qt5::Positioning LOCAT
ION)
SET(ISS_QT_POSITIONING "Source: \"${QtPositioning_location}\"; De
stDir: \"{app}\";")
ELSE()
SET(ISS_QT_POSITIONING "; QtPositioning isn't used")
ENDIF()
IF(ENABLE_MEDIA) IF(ENABLE_MEDIA)
GET_TARGET_PROPERTY(QtMultimedia_location Qt5::Multimedia LOCATIO N) GET_TARGET_PROPERTY(QtMultimedia_location Qt5::Multimedia LOCATIO N)
GET_TARGET_PROPERTY(QtMultimediaWidgets_location Qt5::MultimediaW idgets LOCATION) GET_TARGET_PROPERTY(QtMultimediaWidgets_location Qt5::MultimediaW idgets LOCATION)
SET(ISS_QT_MULTIMEDIA "Source: \"${QtMultimedia_location}\"; Dest Dir: \"{app}\";\nSource: \"${QtMultimediaWidgets_location}\"; DestDir: \"{a pp}\";") SET(ISS_QT_MULTIMEDIA "Source: \"${QtMultimedia_location}\"; Dest Dir: \"{app}\";\nSource: \"${QtMultimediaWidgets_location}\"; DestDir: \"{a pp}\";")
ELSE() ELSE()
SET(ISS_QT_MULTIMEDIA "; QtMultimedia isn't used") SET(ISS_QT_MULTIMEDIA "; QtMultimedia isn't used")
ENDIF() ENDIF()
GET_FILENAME_COMPONENT(QT5_LIBS ${QtCore_location} PATH) GET_FILENAME_COMPONENT(QT5_LIBS ${QtCore_location} PATH)
IF(GENERATE_STELMAINLIB) IF(GENERATE_STELMAINLIB)
SET(STELMAINLIB "Source: \"${CMAKE_INSTALL_PREFIX}/lib/libstelMai n.dll\"; DestDir: \"{app}\";") SET(STELMAINLIB "Source: \"${CMAKE_INSTALL_PREFIX}/lib/libstelMai n.dll\"; DestDir: \"{app}\";")
skipping to change at line 763 skipping to change at line 806
${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/gui ${CMAKE_SOURCE_DIR}/src/gui
${CMAKE_SOURCE_DIR}/src/scripting ${CMAKE_SOURCE_DIR}/src/scripting
${INTL_INCLUDE_DIR} ${INTL_INCLUDE_DIR}
${CMAKE_BINARY_DIR}/src ${CMAKE_BINARY_DIR}/src
) )
########### Subdirectories ############### ########### Subdirectories ###############
ADD_SUBDIRECTORY( data ) ADD_SUBDIRECTORY( data )
ADD_SUBDIRECTORY( models )
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()
ADD_SUBDIRECTORY( landscapes ) ADD_SUBDIRECTORY( landscapes )
ADD_SUBDIRECTORY( skycultures ) ADD_SUBDIRECTORY( skycultures )
ADD_SUBDIRECTORY( nebulae ) ADD_SUBDIRECTORY( nebulae )
IF(ENABLE_SCRIPTING) IF(ENABLE_SCRIPTING)
 End of changes. 20 change blocks. 
24 lines changed or deleted 73 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/