Initial support for building tests with CMake

test/drtest binary is now built by CMake, but is not yet installed or run.

CMakeLists.txt

@@ -55,6 +55,7 @@ pkg_check_modules(PNG libpng REQUIRED)
 pkg_check_modules(AL openal REQUIRED)
 pkg_check_modules(OGG ogg REQUIRED)
 pkg_check_modules(VORBIS vorbisfile REQUIRED)
+pkg_check_modules(X11 x11 REQUIRED)
 
 # Locate wxWidgets
 find_package(wxWidgets REQUIRED
@@ -102,6 +103,13 @@ endif()
 add_subdirectory(radiantcore)
 add_subdirectory(radiant)
 
+# Tests
+pkg_check_modules(GTEST gtest)
+pkg_check_modules(GTEST_MAIN gtest_main)
+if (${GTEST_FOUND} AND ${GTEST_MAIN_FOUND})
+    add_subdirectory(test)
+endif()
+
 # Install main targets
 install(TARGETS darkradiant math xmlutil scenegraph wxutil
         LIBRARY DESTINATION ${PKGLIBDIR})

test/CMakeLists.txt

@@ -0,0 +1,30 @@
+add_executable(drtest
+               Camera.cpp
+               ColourSchemes.cpp
+               CSG.cpp
+               Face.cpp
+               FacePlane.cpp
+               FileTypes.cpp
+               HeadlessOpenGLContext.cpp
+               MapExport.cpp
+               MapSavingLoading.cpp
+               Materials.cpp
+               math/Matrix4.cpp
+               math/Plane3.cpp
+               math/Quaternion.cpp
+               math/Vector3.cpp
+               MessageBus.cpp
+               ModelExport.cpp
+               ModelScale.cpp
+               Models.cpp
+               PatchIterators.cpp
+               PatchWelding.cpp
+               SelectionAlgorithm.cpp
+               Selection.cpp
+               VFS.cpp
+               WorldspawnColour.cpp)
+target_compile_options(drtest PRIVATE ${SIGC_CFLAGS})
+target_link_libraries(drtest PRIVATE
+                      math xmlutil module
+                      ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES}
+                      ${SIGC_LIBRARIES} ${GLEW_LIBRARIES} ${X11_LIBRARIES})

test/PatchWelding.cpp

@@ -203,15 +203,15 @@ TEST_F(PatchWeldingTest, WeldingPreservesFixedSubdivisions)
 
     // Check the setup
     EXPECT_TRUE(firstPatchNode->getPatch().subdivisionsFixed()) << "Patch 1 isn't set to fixed subdivisions 5x2, test map changed?";
-    EXPECT_EQ(firstPatchNode->getPatch().getSubdivisions(), Subdivisions({ 5, 2 })) << "Patch 1 isn't set to fixed subdivisions 5x2, test map changed?";
+    EXPECT_EQ(firstPatchNode->getPatch().getSubdivisions(), Subdivisions(5, 2)) << "Patch 1 isn't set to fixed subdivisions 5x2, test map changed?";
 
     // After merging we expect the merged patch to have the same subdivisions as patch 1 had
     auto mergedNode = performPatchWelding("1", "2");
 
     auto merged = std::dynamic_pointer_cast<IPatchNode>(mergedNode);
 
     EXPECT_TRUE(merged->getPatch().subdivisionsFixed()) << "Merged patch is supposed to have fixed subdivisions 5x2";
-    EXPECT_EQ(merged->getPatch().getSubdivisions(), Subdivisions({ 5, 2 })) << "Merged patch is supposed to have fixed subdivisions 5x2";
+    EXPECT_EQ(merged->getPatch().getSubdivisions(), Subdivisions(5, 2)) << "Merged patch is supposed to have fixed subdivisions 5x2";
 }
 
 TEST_F(PatchWeldingTest, WeldingPreservesNonfixedSubdivisions)