Skip to content

Commit 5e0a7e0

Browse files
alex-walex-w
committed
cosmetic fixes in cmake files
1 parent 5af7cb1 commit 5e0a7e0

File tree

2 files changed

+335
-338
lines changed

2 files changed

+335
-338
lines changed

‎CMakeLists.txt‎

Lines changed: 75 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ENDIF()
1010

1111
SET(ENABLE_EXPORT_COMPILE_COMMANDS 0 CACHE BOOL "Export CMake compile commands for code analysis")
1212
IF(ENABLE_EXPORT_COMPILE_COMMANDS)
13-
SET(CMAKE_EXPORT_COMPILE_COMMANDS on)
13+
SET(CMAKE_EXPORT_COMPILE_COMMANDS on)
1414
ENDIF(ENABLE_EXPORT_COMPILE_COMMANDS)
1515

1616
# warn about deprecated stuff so that we may try fixing it
@@ -26,10 +26,10 @@ SET(STELLARIUM_RELEASE_BUILD 0 CACHE BOOL "Set 1 to build as an official release
2626
########### Detect Qt version
2727
SET(ENABLE_QT6 1 CACHE BOOL "Whether to try building with Qt6. If Qt6 is not found, Qt5 will be used.")
2828
IF(ENABLE_QT6)
29-
FIND_PACKAGE(Qt6 COMPONENTS Core QUIET)
29+
FIND_PACKAGE(Qt6 COMPONENTS Core QUIET)
3030
ENDIF()
3131
if (NOT Qt6_FOUND)
32-
FIND_PACKAGE(Qt5 REQUIRED COMPONENTS Core)
32+
FIND_PACKAGE(Qt5 REQUIRED COMPONENTS Core)
3333
ENDIF()
3434

3535
# Activate this to error on all things deprecated in 5.15
@@ -45,14 +45,14 @@ SET(STELLARIUM_MAJOR 26)
4545
# Number of the release (0 is used before first release)
4646
SET(STELLARIUM_MINOR 0)
4747
IF(STELLARIUM_RELEASE_BUILD)
48-
ADD_DEFINITIONS(-DSTELLARIUM_RELEASE_BUILD)
49-
SET(CMAKE_BUILD_TYPE Release)
50-
SET(STELLARIUM_PATCH 0)
48+
ADD_DEFINITIONS(-DSTELLARIUM_RELEASE_BUILD)
49+
SET(CMAKE_BUILD_TYPE Release)
50+
SET(STELLARIUM_PATCH 0)
5151
ELSE()
52-
########### Get revision number for non-release builds ###########
53-
STRING(TIMESTAMP CDNUMBER "%j")
54-
MATH(EXPR STELLARIUM_PATCH_DIGIT "${CDNUMBER} + 0" OUTPUT_FORMAT DECIMAL)
55-
SET(STELLARIUM_PATCH ${STELLARIUM_PATCH_DIGIT})
52+
########### Get revision number for non-release builds ###########
53+
STRING(TIMESTAMP CDNUMBER "%j")
54+
MATH(EXPR STELLARIUM_PATCH_DIGIT "${CDNUMBER} + 0" OUTPUT_FORMAT DECIMAL)
55+
SET(STELLARIUM_PATCH ${STELLARIUM_PATCH_DIGIT})
5656
ENDIF()
5757
# Use integer versions instead of strings for easier handling if required
5858
ADD_DEFINITIONS(
@@ -258,18 +258,18 @@ IF(APPLE)
258258
SET(SDATALOC "Resources")
259259
ELSE()
260260
IF(HAIKU)
261-
SET(SDATAPREFIX "data")
261+
SET(SDATAPREFIX "data")
262262
ELSE()
263-
SET(SDATAPREFIX "share")
263+
SET(SDATAPREFIX "share")
264264
ENDIF()
265265
# share data location:
266266
SET(SDATALOC "${SDATAPREFIX}/${PACKAGE}")
267267
ENDIF()
268268

269269
IF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_GNUCC)
270270
IF(WIN32)
271-
# The stars structs rely on gnu gcc packing of bit-fields.
272-
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mno-ms-bitfields")
271+
# The stars structs rely on gnu gcc packing of bit-fields.
272+
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mno-ms-bitfields")
273273
ENDIF()
274274
SET(GCC_VERSION "${CMAKE_CXX_COMPILER_VERSION}")
275275
ELSE()
@@ -704,46 +704,46 @@ SET(CMAKE_AUTOUIC ON) # ?
704704
SET(CMAKE_INCLUDE_CURRENT_DIR ON)
705705

706706
IF(ENABLE_SHOWMYSKY)
707-
ADD_DEFINITIONS(-DENABLE_SHOWMYSKY)
708-
CPMFindPackage(NAME ShowMySky-Qt${QT_VERSION_MAJOR}
709-
URL https://github.com/10110111/CalcMySky/archive/refs/tags/v0.4.0.tar.gz
710-
URL_HASH SHA256=1096f3c6067e05dd8c4df601b745cca5e88b843ad1328938e5dba69c1fcfb84f
711-
EXCLUDE_FROM_ALL yes
712-
OPTIONS "QT_VERSION ${QT_VERSION_MAJOR}")
713-
IF(ShowMySky-Qt${QT_VERSION_MAJOR}_ADDED)
714-
# Don't want to link to ShowMySky::ShowMySky directly, so find out its
715-
# include dir and lib location manually.
716-
GET_TARGET_PROPERTY(ShowMySky_INCLUDE_DIRECTORIES
717-
ShowMySky::ShowMySky INTERFACE_INCLUDE_DIRECTORIES)
718-
SET(ShowMySky_LIBRARY $<TARGET_FILE:ShowMySky::ShowMySky>)
719-
MESSAGE(STATUS "Will build ShowMySky library")
720-
INCLUDE(GNUInstallDirs)
721-
IF(APPLE)
722-
INSTALL(TARGETS ShowMySky LIBRARY DESTINATION Frameworks)
723-
ELSE()
724-
INSTALL(TARGETS ShowMySky
707+
ADD_DEFINITIONS(-DENABLE_SHOWMYSKY)
708+
CPMFindPackage(NAME ShowMySky-Qt${QT_VERSION_MAJOR}
709+
URL https://github.com/10110111/CalcMySky/archive/refs/tags/v0.4.0.tar.gz
710+
URL_HASH SHA256=1096f3c6067e05dd8c4df601b745cca5e88b843ad1328938e5dba69c1fcfb84f
711+
EXCLUDE_FROM_ALL yes
712+
OPTIONS "QT_VERSION ${QT_VERSION_MAJOR}")
713+
IF(ShowMySky-Qt${QT_VERSION_MAJOR}_ADDED)
714+
# Don't want to link to ShowMySky::ShowMySky directly, so find out its
715+
# include dir and lib location manually.
716+
GET_TARGET_PROPERTY(ShowMySky_INCLUDE_DIRECTORIES
717+
ShowMySky::ShowMySky INTERFACE_INCLUDE_DIRECTORIES)
718+
SET(ShowMySky_LIBRARY $<TARGET_FILE:ShowMySky::ShowMySky>)
719+
MESSAGE(STATUS "Will build ShowMySky library")
720+
INCLUDE(GNUInstallDirs)
721+
IF(APPLE)
722+
INSTALL(TARGETS ShowMySky LIBRARY DESTINATION Frameworks)
723+
ELSE()
724+
INSTALL(TARGETS ShowMySky
725725
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
726726
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
727-
ENDIF()
728-
# We used EXCLUDE_FROM_ALL in CPMFindPackage to avoid building
729-
# irrelevant binaries of CalcMySky. But we still need to build
730-
# libShowMySky, so add some target which would depend on it.
731-
# stelMain is not defined at this point yet, so can't use it.
732-
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/fake-show-my-sky-client.cpp "")
733-
ADD_LIBRARY(fake-show-my-sky-client SHARED
734-
${CMAKE_CURRENT_BINARY_DIR}/fake-show-my-sky-client.cpp)
735-
ADD_DEPENDENCIES(fake-show-my-sky-client ShowMySky::ShowMySky)
736-
ELSE()
737-
GET_TARGET_PROPERTY(ShowMySky_INCLUDE_DIRECTORIES
738-
ShowMySky::ShowMySky INTERFACE_INCLUDE_DIRECTORIES)
739-
GET_TARGET_PROPERTY(ShowMySky_LIBRARY
740-
ShowMySky::ShowMySky LOCATION)
741-
IF(EXISTS ${ShowMySky_LIBRARY})
742-
MESSAGE(STATUS "Found ShowMySky library: ${ShowMySky_LIBRARY}")
743-
ELSE()
744-
MESSAGE(FATAL_ERROR "Could NOT found ShowMySky library")
745-
ENDIF()
746-
ENDIF()
727+
ENDIF()
728+
# We used EXCLUDE_FROM_ALL in CPMFindPackage to avoid building
729+
# irrelevant binaries of CalcMySky. But we still need to build
730+
# libShowMySky, so add some target which would depend on it.
731+
# stelMain is not defined at this point yet, so can't use it.
732+
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/fake-show-my-sky-client.cpp "")
733+
ADD_LIBRARY(fake-show-my-sky-client SHARED
734+
${CMAKE_CURRENT_BINARY_DIR}/fake-show-my-sky-client.cpp)
735+
ADD_DEPENDENCIES(fake-show-my-sky-client ShowMySky::ShowMySky)
736+
ELSE()
737+
GET_TARGET_PROPERTY(ShowMySky_INCLUDE_DIRECTORIES
738+
ShowMySky::ShowMySky INTERFACE_INCLUDE_DIRECTORIES)
739+
GET_TARGET_PROPERTY(ShowMySky_LIBRARY
740+
ShowMySky::ShowMySky LOCATION)
741+
IF(EXISTS ${ShowMySky_LIBRARY})
742+
MESSAGE(STATUS "Found ShowMySky library: ${ShowMySky_LIBRARY}")
743+
ELSE()
744+
MESSAGE(FATAL_ERROR "Could NOT found ShowMySky library")
745+
ENDIF()
746+
ENDIF()
747747
ENDIF(ENABLE_SHOWMYSKY)
748748

749749
IF(ENABLE_SCRIPTING)
@@ -794,12 +794,11 @@ IF(ENABLE_MEDIA OR USE_PLUGIN_SCENERY3D)
794794
ENDIF()
795795

796796
IF(ENABLE_TESTING)
797-
ENABLE_TESTING()
798-
ADD_DEFINITIONS(-DENABLE_TESTING)
799-
FIND_PACKAGE(Qt${QT_VERSION_MAJOR} COMPONENTS Test REQUIRED)
800-
MESSAGE(STATUS "Unit tests support: enabled")
797+
ADD_DEFINITIONS(-DENABLE_TESTING)
798+
FIND_PACKAGE(Qt${QT_VERSION_MAJOR} COMPONENTS Test REQUIRED)
799+
MESSAGE(STATUS "Unit tests support: enabled")
801800
ELSE(ENABLE_TESTING)
802-
MESSAGE(STATUS "Unit tests support: disabled")
801+
MESSAGE(STATUS "Unit tests support: disabled")
803802
ENDIF(ENABLE_TESTING)
804803

805804
### Zlib package
@@ -843,7 +842,7 @@ IF(ENABLE_XLSX)
843842
CPMAddPackage(NAME QXlsxQt${QT_VERSION_MAJOR}
844843
# URL https://github.com/QtExcel/QXlsx/archive/refs/tags/v1.5.0.tar.gz
845844
# URL_HASH SHA256=4461bb0fc9b88b6a970520e8b32eb7d2fc391a1a5c326b139a0af836278cdb09
846-
URL https://github.com/QtExcel/QXlsx/archive/refs/heads/master.zip
845+
URL https://github.com/QtExcel/QXlsx/archive/refs/heads/master.zip
847846
EXCLUDE_FROM_ALL ON
848847
SOURCE_SUBDIR QXlsx)
849848
ENDIF()
@@ -1083,33 +1082,33 @@ ENDIF()
10831082

10841083
include("cmake/Check-from_chars.cmake")
10851084
IF(NOT FROM_CHARS_WORKS)
1086-
CPMFindPackage(NAME FastFloat
1087-
GIT_REPOSITORY https://github.com/fastfloat/fast_float
1088-
VERSION 6.1.0
1089-
EXCLUDE_FROM_ALL yes)
1090-
GET_TARGET_PROPERTY(FastFloat_INCLUDE_DIRECTORIES
1091-
FastFloat::fast_float INTERFACE_INCLUDE_DIRECTORIES)
1092-
INCLUDE_DIRECTORIES(${FastFloat_INCLUDE_DIRECTORIES})
1093-
ADD_DEFINITIONS(-DUSE_FAST_FLOAT)
1085+
CPMFindPackage(NAME FastFloat
1086+
GIT_REPOSITORY https://github.com/fastfloat/fast_float
1087+
VERSION 6.1.0
1088+
EXCLUDE_FROM_ALL yes)
1089+
GET_TARGET_PROPERTY(FastFloat_INCLUDE_DIRECTORIES
1090+
FastFloat::fast_float INTERFACE_INCLUDE_DIRECTORIES)
1091+
INCLUDE_DIRECTORIES(${FastFloat_INCLUDE_DIRECTORIES})
1092+
ADD_DEFINITIONS(-DUSE_FAST_FLOAT)
10941093
ENDIF()
10951094

10961095
include("cmake/Check-std_execution.cmake")
10971096
IF(STD_EXECUTION_KNOWN)
1098-
ADD_DEFINITIONS(-DSTD_EXECUTION_KNOWN)
1097+
ADD_DEFINITIONS(-DSTD_EXECUTION_KNOWN)
10991098
ENDIF()
11001099

11011100
########### Top level include directories ###########
11021101
# This will be used for all compilations in sub-directories
11031102
INCLUDE_DIRECTORIES(
1104-
${CMAKE_BINARY_DIR}
1105-
${CMAKE_SOURCE_DIR}/src
1106-
${CMAKE_SOURCE_DIR}/src/core
1107-
${CMAKE_SOURCE_DIR}/src/core/modules
1108-
${CMAKE_SOURCE_DIR}/src/core/planetsephems
1109-
${CMAKE_SOURCE_DIR}/src/gui
1110-
${CMAKE_SOURCE_DIR}/src/scripting
1111-
${INTL_INCLUDE_DIR}
1112-
${CMAKE_BINARY_DIR}/src
1103+
${CMAKE_BINARY_DIR}
1104+
${CMAKE_SOURCE_DIR}/src
1105+
${CMAKE_SOURCE_DIR}/src/core
1106+
${CMAKE_SOURCE_DIR}/src/core/modules
1107+
${CMAKE_SOURCE_DIR}/src/core/planetsephems
1108+
${CMAKE_SOURCE_DIR}/src/gui
1109+
${CMAKE_SOURCE_DIR}/src/scripting
1110+
${INTL_INCLUDE_DIR}
1111+
${CMAKE_BINARY_DIR}/src
11131112
)
11141113

11151114
########### Subdirectories ###############

0 commit comments

Comments
 (0)