CMakeLists.txt   CMakeLists.txt 
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11) CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
IF(NOT ("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 3.0))
CMAKE_POLICY(SET CMP0050 OLD)
ENDIF()
########### Project name ########### ########### Project name ###########
PROJECT(Stellarium) PROJECT(Stellarium)
SET(STELLARIUM_MAJOR "0") SET(STELLARIUM_MAJOR "0")
SET(STELLARIUM_MINOR "13") SET(STELLARIUM_MINOR "13")
SET(STELLARIUM_PATCH "0") SET(STELLARIUM_PATCH "1")
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}")
SET(MINIMAL_QT_VERSION "5.1.0") SET(MINIMAL_QT_VERSION "5.2.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)
########### 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 GProf Valgrind Release RelWithDebInfo MinSizeRel." FORC E) 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 # Add gprof build options if necessary. Note gmon.out will be created in w orking directory when Stellarium is executed
skipping to change at line 43 skipping to change at line 47
IF(${CMAKE_BUILD_TYPE} MATCHES "Valgrind") IF(${CMAKE_BUILD_TYPE} MATCHES "Valgrind")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O0 -g") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O0 -g")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0 -g") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0 -g")
ENDIF() ENDIF()
IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
SET(APPLE 1) SET(APPLE 1)
ENDIF() ENDIF()
IF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_GNUCC) IF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_GNUCC)
# The stars structs rely on gnu gcc packing of bit-fields. IF(WIN32)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mno-ms-bitfields") # The stars structs rely on gnu gcc packing of bit-fields.
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mno-ms-bitfields")
ENDIF()
SET(GCC_VERSION "${CMAKE_CXX_COMPILER_VERSION}") SET(GCC_VERSION "${CMAKE_CXX_COMPILER_VERSION}")
ELSE() ELSE()
SET(GCC_VERSION "0.0") SET(GCC_VERSION "0.0")
ENDIF() ENDIF()
IF(WIN32) IF(WIN32)
IF(NOT MSVC) IF(NOT MSVC)
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -fexceptions -fident -mthread SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -fexceptions -fident -mthread
s") s -Wno-unused-parameter -Wno-unused-result")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wsign-promo -fexceptions SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fexceptions -fident -mth
-fident -mthreads") reads -Wno-unused-parameter -Wno-unused-result")
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wsign-promo -fex SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fexceptions -fid
ceptions -fident -mthreads -mwindows") ent -mthreads -mwindows")
ELSE() ELSE()
# Prevent MSVC from complaining about M_PI no matter where <cmath> is i ncluded first # Prevent MSVC from complaining about M_PI no matter where <cmath> is i ncluded first
ADD_DEFINITIONS(-D_USE_MATH_DEFINES) ADD_DEFINITIONS(-D_USE_MATH_DEFINES /D_CRT_SECURE_NO_WARNINGS /wd4244 / wd4005 /wd4101 /wd4996)
ENDIF() ENDIF()
ELSE() ELSE()
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-unused-parameter") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-unused-parameter")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-unused-paramet er -Wno-unused-result") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-unused-paramet er -Wno-unused-result")
ENDIF() ENDIF()
IF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") IF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wno-unused-p rivate-field -Wno-uninitialized -Wno-tautological-constant-out-of-range-com pare") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wno-unused-p rivate-field -Wno-uninitialized -Wno-tautological-constant-out-of-range-com pare")
# The cosmetic fix for Clang 3.4 # The cosmetic fix for Clang 3.4
IF(${CMAKE_CXX_COMPILER_VERSION} VERSION_GREATER 3.3) IF(${CMAKE_CXX_COMPILER_VERSION} VERSION_GREATER 3.3)
skipping to change at line 374 skipping to change at line 380
ENDIF() ENDIF()
GET_FILENAME_COMPONENT(QT5_LIBS ${QtCore_location} PATH) GET_FILENAME_COMPONENT(QT5_LIBS ${QtCore_location} PATH)
IF(MSVC) IF(MSVC)
SET(ISS_ANGLE_LIBS "; ANGLE support (libEGL.dll, libGLESv2.dll and d3dcompiler_*.dll)\nSource: \"${QT5_LIBS}/libEGL.dll\"; DestDir: \"{app}\"; \nSource: \"${QT5_LIBS}/libGLESv2.dll\"; DestDir: \"{app}\";\nSource: \"${Q T5_LIBS}/d3dcompiler_*.dll\"; DestDir: \"{app}\";") SET(ISS_ANGLE_LIBS "; ANGLE support (libEGL.dll, libGLESv2.dll and d3dcompiler_*.dll)\nSource: \"${QT5_LIBS}/libEGL.dll\"; DestDir: \"{app}\"; \nSource: \"${QT5_LIBS}/libGLESv2.dll\"; DestDir: \"{app}\";\nSource: \"${Q T5_LIBS}/d3dcompiler_*.dll\"; DestDir: \"{app}\";")
ELSE() ELSE()
SET(ISS_ANGLE_LIBS "; ANGLE support doesn't exists for MinGW") SET(ISS_ANGLE_LIBS "; ANGLE support doesn't exists for MinGW")
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_WINDOWS_PLUGIN "Source: \"${QT5_LIBS}/../plugins/platforms/qwin dows.dll\"; DestDir: \"{app}/platforms/\";") SET(ISS_WINDOWS_PLUGIN "Source: \"${QT5_LIBS}/../plugins/platforms/qwin dows.dll\"; DestDir: \"{app}/platforms/\";")
SET(ISS_ICO_PLUGIN "Source: \"${QT5_LIBS}/../plugins/imageformats/qico. dll\"; DestDir: \"{app}/imageformats/\";")
IF(ENABLE_SOUND) IF(ENABLE_SOUND)
SET(ISS_MULTIMEDIA_PLUGINS "Source: \"${QT5_LIBS}/../plugins/medias ervice/dsengine.dll\"; DestDir: \"{app}/mediaservice/\";\nSource: \"${QT5_L IBS}/../plugins/mediaservice/qtmedia_audioengine.dll\"; DestDir: \"{app}/me diaservice/\";\nSource: \"${QT5_LIBS}/../plugins/playlistformats/qtmultimed ia_m3u.dll\"; DestDir: \"{app}/playlistformats/\";") SET(ISS_MULTIMEDIA_PLUGINS "Source: \"${QT5_LIBS}/../plugins/medias ervice/dsengine.dll\"; DestDir: \"{app}/mediaservice/\";\nSource: \"${QT5_L IBS}/../plugins/mediaservice/qtmedia_audioengine.dll\"; DestDir: \"{app}/me diaservice/\";\nSource: \"${QT5_LIBS}/../plugins/playlistformats/qtmultimed ia_m3u.dll\"; DestDir: \"{app}/playlistformats/\";")
ELSE() ELSE()
SET(ISS_MULTIMEDIA_PLUGINS "; QtMultimedia don't used") SET(ISS_MULTIMEDIA_PLUGINS "; QtMultimedia don't used")
ENDIF() ENDIF()
SET(ISS_QML_DIR "Source: \"${QT5_LIBS}/../imports/Qt/labs/shaders/qmldi r\"; DestDir: \"{app}/Qt/labs/shaders/\";") SET(ISS_QML_DIR "Source: \"${QT5_LIBS}/../imports/Qt/labs/shaders/qmldi r\"; DestDir: \"{app}/Qt/labs/shaders/\";")
SET(ISS_QML_PLUGINS "Source: \"${QT5_LIBS}/../imports/Qt/labs/shaders/p lugins.qmltypes\"; DestDir: \"{app}/Qt/labs/shaders/\";") SET(ISS_QML_PLUGINS "Source: \"${QT5_LIBS}/../imports/Qt/labs/shaders/p lugins.qmltypes\"; DestDir: \"{app}/Qt/labs/shaders/\";")
SET(ISS_QML_SHADERS "Source: \"${QT5_LIBS}/../imports/Qt/labs/shaders/q mlshadersplugin.dll\"; DestDir: \"{app}/Qt/labs/shaders/\";") SET(ISS_QML_SHADERS "Source: \"${QT5_LIBS}/../imports/Qt/labs/shaders/q mlshadersplugin.dll\"; DestDir: \"{app}/Qt/labs/shaders/\";")
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/stellarium.iss.cmake ${CMAKE_SOURCE_ DIR}/stellarium.iss @ONLY) CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/stellarium.iss.cmake ${CMAKE_SOURCE_ DIR}/stellarium.iss @ONLY)
 End of changes. 7 change blocks. 
11 lines changed or deleted 18 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/