Bladeren bron

Merge pull request #3196 from jmerdich/fix-ea-source-build

[EA source]: Ignore git-related files in cmake for early access tarballs
bunnei 6 jaren geleden
bovenliggende
commit
ef2b6733d0
1 gewijzigde bestanden met toevoegingen van 5 en 2 verwijderingen
  1. 5 2
      CMakeLists.txt

+ 5 - 2
CMakeLists.txt

@@ -29,7 +29,7 @@ option(ENABLE_VULKAN "Enables Vulkan backend" ON)
 
 
 option(USE_DISCORD_PRESENCE "Enables Discord Rich Presence" OFF)
 option(USE_DISCORD_PRESENCE "Enables Discord Rich Presence" OFF)
 
 
-if(NOT EXISTS ${PROJECT_SOURCE_DIR}/.git/hooks/pre-commit)
+if(EXISTS ${PROJECT_SOURCE_DIR}/hooks/pre-commit AND NOT EXISTS ${PROJECT_SOURCE_DIR}/.git/hooks/pre-commit)
     message(STATUS "Copying pre-commit hook")
     message(STATUS "Copying pre-commit hook")
     file(COPY hooks/pre-commit
     file(COPY hooks/pre-commit
         DESTINATION ${PROJECT_SOURCE_DIR}/.git/hooks)
         DESTINATION ${PROJECT_SOURCE_DIR}/.git/hooks)
@@ -49,7 +49,10 @@ function(check_submodules_present)
         endif()
         endif()
     endforeach()
     endforeach()
 endfunction()
 endfunction()
-check_submodules_present()
+
+if(EXISTS ${PROJECT_SOURCE_DIR}/.gitmodules)
+    check_submodules_present()
+endif()
 
 
 configure_file(${PROJECT_SOURCE_DIR}/dist/compatibility_list/compatibility_list.qrc
 configure_file(${PROJECT_SOURCE_DIR}/dist/compatibility_list/compatibility_list.qrc
                ${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.qrc
                ${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.qrc