Ivan Savenko 2 years ago
parent
commit
b1427f695b
3 changed files with 16 additions and 8 deletions
  1. 1 1
      CI/linux/before_install.sh
  2. 14 6
      CMakeLists.txt
  3. 1 1
      launcher/mainwindow_moc.cpp

+ 1 - 1
CI/linux/before_install.sh

@@ -5,7 +5,7 @@ sudo apt-get update
 # Dependencies
 sudo apt-get install libboost-all-dev
 sudo apt-get install libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev
-sudo apt-get install qtbase5-dev 
+sudo apt-get install qtbase5-dev
 sudo apt-get install ninja-build zlib1g-dev libavformat-dev libswscale-dev libtbb-dev libluajit-5.1-dev
 # Optional dependencies
 sudo apt-get install libminizip-dev libfuzzylite-dev qttools5-dev

+ 14 - 6
CMakeLists.txt

@@ -128,14 +128,22 @@ else()
 endif(ENABLE_GITVERSION)
 
 # Precompiled header configuration
-if(ENABLE_PCH AND NOT ${CMAKE_VERSION} VERSION_LESS "3.16.0")
+if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0 )
+	set(ENABLE_PCH OFF) # broken
+endif()
+
+if( ${CMAKE_VERSION} VERSION_LESS "3.16.0")
+	set(ENABLE_PCH OFF) #not supported
+endif()
+
+if(ENABLE_PCH)
 	macro(enable_pch name)
 		target_precompile_headers(${name} PRIVATE $<$<COMPILE_LANGUAGE:CXX>:<StdInc.h$<ANGLE-R>>)
 	endmacro(enable_pch)
-else(ENABLE_PCH AND NOT ${CMAKE_VERSION} VERSION_LESS "3.16.0")
+else()
 	macro(enable_pch ignore)
 	endmacro(enable_pch)
-endif(ENABLE_PCH AND NOT ${CMAKE_VERSION} VERSION_LESS "3.16.0")
+endif()
 
 ############################################
 #        Documentation section             #
@@ -337,12 +345,12 @@ endif()
 
 if(ENABLE_LAUNCHER OR ENABLE_EDITOR)
 	# Widgets finds its own dependencies (QtGui and QtCore).
-	find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets Network )
-	find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets Network )
+	find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets Network)
+	find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets Network)
 
 	find_package(QT NAMES Qt6 Qt5 COMPONENTS LinguistTools )
 	find_package(Qt${QT_VERSION_MAJOR} COMPONENTS LinguistTools)
-	if(NOT Qt5LinguistTools_DIR)
+	if(NOT Qt${QT_VERSION_MAJOR}LinguistTools_DIR)
 		set(ENABLE_TRANSLATIONS OFF)
 	endif()
 	if(ENABLE_TRANSLATIONS)

+ 1 - 1
launcher/mainwindow_moc.cpp

@@ -164,7 +164,7 @@ void MainWindow::on_lobbyButton_clicked()
 void MainWindow::updateTranslation()
 {
 #ifdef ENABLE_QT_TRANSLATIONS
-	std::string translationFile = settings["general"]["language"].String()+ ".qm";
+	std::string translationFile = settings["general"]["language"].String() + ".qm";
 
 	QVector<QString> searchPaths;