diff options
| author | Alexander V. Wolf <alex.v.wolf@gmail.com> | 2022-01-24 22:55:48 +0700 |
|---|---|---|
| committer | Alexander V. Wolf <alex.v.wolf@gmail.com> | 2022-01-24 22:55:48 +0700 |
| commit | 79b4ff866a065a1e19e8cf438ca4bae9c288e5de (patch) | |
| tree | 86852ac730b1276b57740756d405e4b6ab1b247f | |
| parent | cda63bf04894a0dc1f9a9b9b9228f46ad5674081 (diff) | |
Fix cmake for Ubuntu 18.04 (GCC 7.5+) and unit tests (related to renaming the SC)
| -rw-r--r-- | CMakeLists.txt | 11 | ||||
| -rw-r--r-- | src/tests/testStelSkyCultureMgr.cpp | 4 |
2 files changed, 5 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 50870497e8..cedb466d4e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -235,13 +235,8 @@ SET(CMAKE_CXX_STANDARD_REQUIRED ON) SET(CMAKE_CXX_EXTENSIONS OFF) # NOTE: C_STANDARD 17 and 23 values added in CMake 3.21 # https://gitlab.kitware.com/cmake/cmake/-/issues/22366 -IF(CMAKE_VERSION VERSION_LESS 3.21.0) - SET(CMAKE_C_STANDARD 11) - #SET(CMAKE_C_FLAGS "-std=c11 ${CMAKE_C_FLAGS}") -ELSE() - SET(CMAKE_C_STANDARD 17) - #SET(CMAKE_C_FLAGS "-std=c17 ${CMAKE_C_FLAGS}") -ENDIF() +# Ubuntu 18.04 have GCC 7.5 - so, C11 only +SET(CMAKE_C_STANDARD 11) SET(CMAKE_C_STANDARD_REQUIRED ON) SET(CMAKE_C_EXTENSIONS OFF) @@ -781,7 +776,7 @@ IF(APPLE) FIND_PROGRAM(MACDEPLOYQT_COMMAND macdeployqt HINTS "${_qt_bin_dir}") IF(NOT CMAKE_OSX_DEPLOYMENT_TARGET) - SET(CMAKE_OSX_DEPLOYMENT_TARGET "10.12" CACHE STRING "Minimum OS X deployment version" FORCE) + SET(CMAKE_OSX_DEPLOYMENT_TARGET "10.13" CACHE STRING "Minimum OS X deployment version" FORCE) ENDIF() MESSAGE(STATUS "Mac OS X deployment target: ${CMAKE_OSX_DEPLOYMENT_TARGET}") SET(PACKAGE_OSX_TARGET ${CMAKE_OSX_DEPLOYMENT_TARGET}) diff --git a/src/tests/testStelSkyCultureMgr.cpp b/src/tests/testStelSkyCultureMgr.cpp index 3bc2e43360..8e44f93d03 100644 --- a/src/tests/testStelSkyCultureMgr.cpp +++ b/src/tests/testStelSkyCultureMgr.cpp @@ -34,8 +34,8 @@ void TestStelSkyCultureMgr::testStelSkyCultureMgr() StelSkyCultureMgr scMgr; QVERIFY(scMgr.getDefaultSkyCultureID().isEmpty()); // Shoud be true, because sky culture is not set! (StelSkyCultureMgr::init() isn't called) - QVERIFY(scMgr.setCurrentSkyCultureID("al-sufi")); - QVERIFY(scMgr.getCurrentSkyCultureID()=="al-sufi"); + QVERIFY(scMgr.setCurrentSkyCultureID("arabic_al-sufi")); + QVERIFY(scMgr.getCurrentSkyCultureID()=="arabic_al-sufi"); QVERIFY(scMgr.setCurrentSkyCultureID("western")); QVERIFY(scMgr.getCurrentSkyCultureID()=="western"); QVERIFY(scMgr.getCurrentSkyCultureEnglishName()=="Western"); |