2 files changed, 14 insertions, 12 deletions
diff --git a/Tests/CMakeLib/CMakeLists.txt b/Tests/CMakeLib/CMakeLists.txt
index 9f09185..06df53f 100644
--- a/Tests/CMakeLib/CMakeLists.txt
+++ b/Tests/CMakeLib/CMakeLists.txt
@@ -5,21 +5,21 @@ include_directories(
   )
 
 set(CMakeLib_TESTS
-  testGeneratedFileStream
-  testRST
-  testSystemTools
-  testUTF8
-  testXMLParser
-  testXMLSafe
-  testFindPackageCommand
-  testUVRAII
+  testGeneratedFileStream.cxx
+  testRST.cxx
+  testSystemTools.cxx
+  testUTF8.cxx
+  testXMLParser.cxx
+  testXMLSafe.cxx
+  testFindPackageCommand.cxx
+  testUVRAII.cxx
   )
 
 set(testRST_ARGS ${CMAKE_CURRENT_SOURCE_DIR})
 
 if(WIN32)
   list(APPEND CMakeLib_TESTS
-    testVisualStudioSlnParser
+    testVisualStudioSlnParser.cxx
     )
   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/testVisualStudioSlnParser.h.in
                  ${CMAKE_CURRENT_BINARY_DIR}/testVisualStudioSlnParser.h @ONLY)
@@ -38,7 +38,8 @@ set_property(TARGET CMakeLibTests PROPERTY CXX_CLANG_TIDY "")
 add_executable(testEncoding testEncoding.cxx)
 target_link_libraries(testEncoding cmsys)
 
-foreach(test ${CMakeLib_TESTS})
+foreach(testfile ${CMakeLib_TESTS})
+  get_filename_component(test "${testfile}" NAME_WE)
   add_test(CMakeLib.${test} CMakeLibTests ${test} ${${test}_ARGS})
 endforeach()
 
diff --git a/Tests/CMakeServerLib/CMakeLists.txt b/Tests/CMakeServerLib/CMakeLists.txt
index 5e1ad0c..2c23c2d 100644
--- a/Tests/CMakeServerLib/CMakeLists.txt
+++ b/Tests/CMakeServerLib/CMakeLists.txt
@@ -5,7 +5,7 @@ include_directories(
   )
 
 set(CMakeServerLib_TESTS
-  testServerBuffering
+  testServerBuffering.cpp
   )
 
 create_test_sourcelist(CMakeLib_TEST_SRCS CMakeServerLibTests.cxx ${CMakeServerLib_TESTS})
@@ -15,6 +15,7 @@ target_link_libraries(CMakeServerLibTests CMakeLib CMakeServerLib)
 SET_PROPERTY(TARGET CMakeServerLibTests PROPERTY C_CLANG_TIDY "")
 SET_PROPERTY(TARGET CMakeServerLibTests PROPERTY CXX_CLANG_TIDY "")
 
-foreach(test ${CMakeServerLib_TESTS})
+foreach(testfile ${CMakeServerLib_TESTS})
+  get_filename_component(test "${testfile}" NAME_WE)
   add_test(CMakeServerLib.${test} CMakeServerLibTests ${test} ${${test}_ARGS})
 endforeach()