Revert submodule labels.

.gitmodules

@@ -1,6 +1,6 @@
-[submodule "googletest"]
+[submodule "vendor/googletest"]
 	path = vendor/googletest
 	url = https://github.com/google/googletest.git
-[submodule "fmt"]
+[submodule "vendor/fmt"]
 	path = vendor/fmt
 	url = https://github.com/fmtlib/fmt.git

cmake/initialize-submodules.cmake

@@ -7,21 +7,25 @@
 macro(add_submodule module_name)
 
   message(STATUS "Attempting to add \"${module_name}\" to project \"${PROJECT_NAME}\"")
+
   set(have_submodule FALSE)
   set(have_path FALSE)
 
-  # first optional argument is module path
+  set(Args ${ARGN})
+  list(LENGTH Args NumArgs)
+
+  # first optional argument is module reference
   if(NumArgs GREATER 0)
-    set(module_path ${ARGV1})
+    set(module_ref_name ${ARGV1})
   else()
-    set(module_path ${CMAKE_CURRENT_SOURCE_DIR}/${module_name})
+    set(module_ref_name ${module_name})
   endif()
 
-  # second optional argument is module reference
+  # second optional argument is module path
   if(NumArgs GREATER 1)
-    set(module_ref_name ${ARGV2})
+    set(module_path ${ARGV2})
   else()
-    set(module_ref_name ${module_name})
+    set(module_path ${CMAKE_CURRENT_SOURCE_DIR}/${module_name})
   endif()
 
   set(is_submodule FALSE)
@@ -59,9 +63,9 @@ macro(add_submodule module_name)
                   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
                   RESULT_VARIABLE GIT_SUBMOD_RESULT)
           if(GIT_SUBMOD_RESULT EQUAL "0")
-            message(STATUS "Successfully updated submodule \"${module_name}\" at ${submodule_path}")
+            message(STATUS "Successfully updated submodule \"${module_name}\"")
           else()
-            message(FATAL_ERROR "Unable to update submodule \"${module_name}\" at ${submodule_path}")
+            message(FATAL_ERROR "Unable to update submodule \"${module_name}\"")
           endif()
         endif()
       else()

vendor/CMakeLists.txt

@@ -1,6 +1,6 @@
 include(initialize-submodules)
 
-add_submodule(fmt)
+add_submodule(fmt vendor/fmt)
 if (NOT TARGET fmt)
     set(FMT_INSTALL OFF CACHE BOOL "" FORCE)
     mark_as_advanced(FMT_CMAKE_DIR FMT_CUDA_TEST FMT_DEBUG_POSTFIX FMT_DOC FMT_FUZZ FMT_INC_DIR FMT_INSTALL FMT_INSTALL
@@ -18,5 +18,5 @@ if (${PROJECT_NAME}_BUILD_TESTING AND NOT TARGET gtest)
     set(INSTALL_GTEST OFF CACHE BOOL "" FORCE)
     mark_as_advanced(BUILD_GTEST BUILD_GMOCK INSTALL_GTEST)
 
-    add_submodule(gtest ${CMAKE_CURRENT_SOURCE_DIR}/googletest googletest)
+    add_submodule(gtest vendor/googletest ${CMAKE_CURRENT_SOURCE_DIR}/googletest)
 endif ()