Procházet zdrojové kódy

Merge pull request #90 from paulsapps/installer

Installer
paulsapps před 11 roky
rodič
revize
2b0b20f1d8
2 změnil soubory, kde provedl 8 přidání a 1 odebrání
  1. 7 0
      QGearsMain/CMakeLists.txt
  2. 1 1
      dependencies/SUDM

+ 7 - 0
QGearsMain/CMakeLists.txt

@@ -334,7 +334,11 @@ add_library(QGearsMain STATIC
   ${HEADER_FILES}
   ${SOURCE_FILES}
 )
+
+# Coverage uses more memory, combined with PCH can cause OOM/ICE
+if ($ENV{COVERAGE}!=1)
 cotire(QGearsMain)
+endif()
 SET_PROPERTY(TARGET QGearsMain PROPERTY FOLDER "q-gears")
 
 add_library(q-gears-data STATIC
@@ -342,7 +346,10 @@ add_library(q-gears-data STATIC
  ${SOURCE_FILES_DATA}
  )
 add_dependencies(q-gears-data configure_qgears_version)
+# Coverage uses more memory, combined with PCH can cause OOM/ICE
+if ($ENV{COVERAGE}!=1)
 cotire(q-gears-data)
+endif()
 SET_PROPERTY(TARGET q-gears-data PROPERTY FOLDER "q-gears")
 
 

+ 1 - 1
dependencies/SUDM

@@ -1 +1 @@
-Subproject commit 66ae9c61d44ccca61859fc343dd740b05f4a2f12
+Subproject commit 2ae28f1d9f5ef236eeadcbd77aaa7ec1722a6b14