Bring back submodules, but use the no-test branches.

.github/workflows/c-cpp.yml

@@ -8,12 +8,13 @@ on:
 
 jobs:
   checkout:
-    name: Checkout EASTL
+    name: Checkout EASTL and submodules
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
         with:
           path: EASTL/
+      - run: cd EASTL/ && git submodule update --init
       - name: Upload checked out code
         uses: actions/[email protected]
         with:

.gitmodules

@@ -0,0 +1,18 @@
+[submodule "test/packages/EABase"]
+	path = test/packages/EABase
+	url = ../EABase.git
+[submodule "test/packages/EAAssert"]
+	path = test/packages/EAAssert
+	url = ../EAAssert.git
+[submodule "test/packages/EAMain"]
+	path = test/packages/EAMain
+	url = ../EAMain.git
+[submodule "test/packages/EAStdC"]
+	path = test/packages/EAStdC
+	url = ../EAStdC.git
+[submodule "test/packages/EATest"]
+	path = test/packages/EATest
+	url = ../EATest.git
+[submodule "test/packages/EAThread"]
+	path = test/packages/EAThread
+	url = ../EAThread.git

CMakeLists.txt

@@ -2,7 +2,6 @@
 # Copyright (C) Electronic Arts Inc.  All rights reserved.
 #-------------------------------------------------------------------------------------------
 cmake_minimum_required(VERSION 3.11)
-include(FetchContent)
 project(EASTL CXX)
 
 #-------------------------------------------------------------------------------------------
@@ -70,14 +69,9 @@ target_include_directories(EASTL PUBLIC include)
 #-------------------------------------------------------------------------------------------
 # Dependencies
 #-------------------------------------------------------------------------------------------
-FetchContent_Declare(
-  EABase
-  GIT_REPOSITORY https://github.com/electronicarts/EABase.git
-  GIT_TAG        123363eb82e132c0181ac53e43226d8ee76dea12
-  GIT_SUBMODULES "" # This should be temporary until we update the cyclic submodule dependencies in EABase.
-)
-
-FetchContent_MakeAvailable(EABase)
+if (NOT TARGET EABase)
+    add_subdirectory(test/packages/EABase)
+endif()
 
 target_link_libraries(EASTL EABase)
 

CONTRIBUTING.md

@@ -27,13 +27,18 @@ Your pull request should:
 
 ### Getting the Repository
 
+EASTL uses git submodules for its dependencies as they are seperate git repositories.
+It is recommended to use the following to get the source:
+
 ```bash
 git clone https://github.com/electronicarts/EASTL
+cd EASTL
+git submodule update --init
 ```
 
 ### Running the Unit Tests
 
-EASTL uses CMake as its build system. 
+EASTL uses CMake as its build system.
 
 * Create and navigate to "your_build_folder":
 	* mkdir your_build_folder && cd your_build_folder

test/CMakeLists.txt

@@ -5,7 +5,7 @@
 #-------------------------------------------------------------------------------------------
 # CMake info
 #-------------------------------------------------------------------------------------------
-cmake_minimum_required(VERSION 3.11)
+cmake_minimum_required(VERSION 3.5)
 project(EASTLTest CXX)
 include(CTest)
 
@@ -72,64 +72,23 @@ add_executable(EASTLTest ${SOURCES})
 target_include_directories(EASTLTest PUBLIC include)
 
 #-------------------------------------------------------------------------------------------
-# Dependencies 
+# Dependencies
 #-------------------------------------------------------------------------------------------
-FetchContent_Declare(
-  EABase
-  GIT_REPOSITORY https://github.com/electronicarts/EABase.git
-  GIT_TAG        123363eb82e132c0181ac53e43226d8ee76dea12
-  GIT_SUBMODULES "" # This should be temporary until we update the cyclic submodule dependencies in EABase.
-)
-FetchContent_MakeAvailable(EABase)
-target_link_libraries(EASTLTest EABase)
+add_subdirectory(packages/EABase)
+add_subdirectory(packages/EAAssert)
+add_subdirectory(packages/EAStdC)
+add_subdirectory(packages/EAMain)
+add_subdirectory(packages/EATest)
+add_subdirectory(packages/EAThread)
 
-FetchContent_Declare(
-  EAAssert
-  GIT_REPOSITORY https://github.com/electronicarts/EAAssert.git
-  GIT_TAG        e5e181255de2e883dd1f987c78ccc42ac81d3bca
-  GIT_SUBMODULES "" # This should be temporary until we update the cyclic submodule dependencies in EAAssert.
-)
-FetchContent_MakeAvailable(EAAssert)
+target_link_libraries(EASTLTest EABase)
 target_link_libraries(EASTLTest EAAssert)
-
-FetchContent_Declare(
-  EAStdC
-  GIT_REPOSITORY https://github.com/electronicarts/EAStdC.git
-  GIT_TAG        fbcc34e89c63636054334888f3a5bd7ac2fd4b76
-  GIT_SUBMODULES "" # This should be temporary until we update the cyclic submodule dependencies in EAStdC.
-)
-FetchContent_MakeAvailable(EAStdC)
-target_link_libraries(EASTLTest EAStdC)
-
-FetchContent_Declare(
-  EAMain
-  GIT_REPOSITORY https://github.com/electronicarts/EAMain.git
-  GIT_TAG        24ca8bf09e6b47b860286fc2f4c832f4009273d1
-  GIT_SUBMODULES "" # This should be temporary until we update the cyclic submodule dependencies in EAMain.
-)
-FetchContent_MakeAvailable(EAMain)
 target_link_libraries(EASTLTest EAMain)
-
-FetchContent_Declare(
-  EATest
-  GIT_REPOSITORY https://github.com/electronicarts/EATest.git
-  GIT_TAG        a59b372fc9cba517283ad6d060d2ab96e0ba34ac
-  GIT_SUBMODULES "" # This should be temporary until we update the cyclic submodule dependencies in EATest.
-)
-FetchContent_MakeAvailable(EATest)
+target_link_libraries(EASTLTest EASTL)
+target_link_libraries(EASTLTest EAStdC)
 target_link_libraries(EASTLTest EATest)
-
-FetchContent_Declare(
-  EAThread
-  GIT_REPOSITORY https://github.com/electronicarts/EAThread.git
-  GIT_TAG        f3c6c54d19699639a5edcf5237ea8b71aca6842c
-  GIT_SUBMODULES "" # This should be temporary until we update the cyclic submodule dependencies in EAThread.
-)
-FetchContent_MakeAvailable(EAThread)
 target_link_libraries(EASTLTest EAThread)
 
-target_link_libraries(EASTLTest EASTL)
-
 set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_package(Threads REQUIRED)
 
@@ -144,4 +103,3 @@ endif()
 #-------------------------------------------------------------------------------------------
 add_test(EASTLTestRuns EASTLTest)
 set_tests_properties (EASTLTestRuns PROPERTIES PASS_REGULAR_EXPRESSION "RETURNCODE=0")
-