[mapguide-commits] r9665 - in sandbox/jng/catch2: . Server/src/UnitTesting cmake/modules

[svn_mapguide at osgeo.org]

Author: jng
Date: 2020-07-13 09:36:42 -0700 (Mon, 13 Jul 2020)
New Revision: 9665

Modified:
   sandbox/jng/catch2/CMakeLists.txt
   sandbox/jng/catch2/Server/src/UnitTesting/CMakeLists.txt
   sandbox/jng/catch2/cmake/modules/FindMapGuideThirdparty.cmake
Log:
Speculative changes to support Linux builds, until we build this on Linux and find out what we missed.

Modified: sandbox/jng/catch2/CMakeLists.txt
===================================================================
--- sandbox/jng/catch2/CMakeLists.txt	2020-07-13 15:45:01 UTC (rev 9664)
+++ sandbox/jng/catch2/CMakeLists.txt	2020-07-13 16:36:42 UTC (rev 9665)
@@ -42,7 +42,6 @@
 endif ((NOT MG_CPU EQUAL 32) AND (NOT MG_CPU EQUAL 64))
 
 #message(STATUS "INTERNAL_ACE = ${INTERNAL_ACE}")
-#message(STATUS "INTERNAL_CPPUNIT = ${INTERNAL_CPPUNIT}")
 #message(STATUS "INTERNAL_ZLIB = ${INTERNAL_ZLIB}")
 #message(STATUS "INTERNAL_LIBPNG = ${INTERNAL_LIBPNG}")
 #message(STATUS "INTERNAL_JPEG = ${INTERNAL_JPEG}")

Modified: sandbox/jng/catch2/Server/src/UnitTesting/CMakeLists.txt
===================================================================
--- sandbox/jng/catch2/Server/src/UnitTesting/CMakeLists.txt	2020-07-13 15:45:01 UTC (rev 9664)
+++ sandbox/jng/catch2/Server/src/UnitTesting/CMakeLists.txt	2020-07-13 16:36:42 UTC (rev 9665)
@@ -1,5 +1,5 @@
 include_directories(${ACE_INCLUDE_DIR}
-    ${CPPUNIT_INCLUDE_DIR}
+    ${CATCH2_INCLUDE_DIR}
     ${XERCESC_INCLUDE_DIR}
     ${MG_COMMON_DIR}/Foundation
     ${MG_COMMON_DIR}/Geometry

Modified: sandbox/jng/catch2/cmake/modules/FindMapGuideThirdparty.cmake
===================================================================
--- sandbox/jng/catch2/cmake/modules/FindMapGuideThirdparty.cmake	2020-07-13 15:45:01 UTC (rev 9664)
+++ sandbox/jng/catch2/cmake/modules/FindMapGuideThirdparty.cmake	2020-07-13 16:36:42 UTC (rev 9665)
@@ -5,7 +5,6 @@
 
 if (ALL_THIRDPARTY)
     set(INTERNAL_ACE true)
-    set(INTERNAL_CPPUNIT true)
     set(INTERNAL_ZLIB true)
     set(INTERNAL_LIBPNG true)
     set(INTERNAL_JPEG true)
@@ -154,25 +153,6 @@
     find_package(PNG REQUIRED)
 endif (INTERNAL_PNG)
 
-if (INTERNAL_CPPUNIT)
-    message(STATUS "Using internal cppunit")
-    #find_package(CppUnit REQUIRED
-    #    PATHS ${MG_OEM_WORK_DIR}/cppunit
-    #          ${MG_OEM_WORK_DIR}/cppunit/.libs)
-    find_path(CPPUNIT_INCLUDE_DIR 
-        NAMES "cppunit/CompilerOutputter.h"
-        PATHS ${MG_OEM_WORK_DIR}/CppUnit/include)
-    find_library(CPPUNIT_LIBRARIES 
-        NAMES cppunit
-        PATHS ${MG_OEM_WORK_DIR}/CppUnit/src/cppunit/.libs)
-    message(STATUS "cppunit Include Dir: ${CPPUNIT_INCLUDE_DIR}")
-    message(STATUS "cppunit Library: ${CPPUNIT_LIBRARIES}")
-    FIND_PACKAGE_HANDLE_STANDARD_ARGS(cppunit DEFAULT_MSG CPPUNIT_LIBRARIES CPPUNIT_INCLUDE_DIR)
-    mark_as_advanced(CPPUNIT_INCLUDE_DIR CPPUNIT_LIBRARIES)
-else (INTERNAL_CPPUNIT)
-    find_package(CppUnit REQUIRED)
-endif (INTERNAL_CPPUNIT)
-
 if (INTERNAL_JSON)
     message(STATUS "Using internal jsoncpp")
     find_path(JsonCpp_INCLUDE_DIR 
@@ -205,6 +185,11 @@
     find_package(ZLIB REQUIRED)
 endif (INTERNAL_ZLIB)
 
+find_path(CATCH2_INCLUDE_DIR 
+    NAMES "catch.hpp"
+    PATHS ${MG_OEM_WORK_DIR}/catch2)
+mark_as_advanced(CATCH2_INCLUDE_DIR)
+
 find_package(FDO REQUIRED)
 find_package(TCLAP REQUIRED)
 find_package(LinuxApt REQUIRED)