Merge pull request #382 from Autodesk/sabrih/MAYA-103926/cleanup_gtes…

…t_module_name Rename googletest file names to match the naming convention in the cmake system.
Autodesk · Mar 25, 2020 · e40ac82 · e40ac82
2 parents 46844bd + c106b40
commit e40ac82
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -147,7 +147,7 @@ string(REPLACE ";" " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
 # test
 #------------------------------------------------------------------------------
 if (BUILD_TESTS)
-    include(cmake/Googletest.cmake)
+    include(cmake/googletest.cmake)
     include(cmake/test.cmake)
     fetch_googletest()
     enable_testing()

diff --git a/cmake/Googletest.cmake → cmake/googletest.cmake b/cmake/Googletest.cmake → cmake/googletest.cmake
@@ -25,9 +25,9 @@ macro(fetch_googletest)
         # sequence parsing errors.  PPT, 22-Nov-2018.
         file(TO_CMAKE_PATH ${CMAKE_MAKE_PROGRAM} CMAKE_MAKE_PROGRAM)
         if (GOOGLETEST_SRC_DIR)
-            configure_file(cmake/CMakeLists_googletest_src.txt.in ${GOOGLETEST_BUILD_ROOT}/googletest-config/CMakeLists.txt)
+            configure_file(cmake/googletest_src.txt.in ${GOOGLETEST_BUILD_ROOT}/googletest-config/CMakeLists.txt)
         else()
-            configure_file(cmake/CMakeLists_googletest_download.txt.in ${GOOGLETEST_BUILD_ROOT}/googletest-config/CMakeLists.txt)
+            configure_file(cmake/googletest_download.txt.in ${GOOGLETEST_BUILD_ROOT}/googletest-config/CMakeLists.txt)
         endif()
 
         message(STATUS "========== Installing GoogleTest... ==========")

diff --git a/cmake/CMakeLists_googletest_download.txt.in → cmake/googletest_download.txt.in b/cmake/CMakeLists_googletest_download.txt.in → cmake/googletest_download.txt.in
diff --git a/cmake/CMakeLists_googletest_src.txt.in → cmake/googletest_src.txt.in b/cmake/CMakeLists_googletest_src.txt.in → cmake/googletest_src.txt.in