move to pulling in the core cpputest-for-qpc library as a git submodule.

Author: mattheweshleman

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "externals/qpc"]
 path = externals/qpc
 url = git@github.com:QuantumLeaps/qpc.git
+[submodule "externals/cpputest-for-qpc"]
+path = externals/cpputest-for-qpc
+url = https://github.com/covemountainsoftware/cpputest-for-qpc.git

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.16)
-project(cpputest-for-qpc)
+project(cpputest-for-qpc-examples)
 
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_C_STANDARD 11)
@@ -9,16 +9,17 @@ add_compile_options(-Wall -Wextra -Werror)
 include_directories(include)
 
 set(EXTERNALS_TOP_DIR ${CMAKE_CURRENT_SOURCE_DIR}/externals)
+
+# set CMS_QPC_TOP_DIR to avoid cpputest-for-qpc-lib from fetching its own copy of QP/C
 set(CMS_QPC_TOP_DIR ${EXTERNALS_TOP_DIR}/qpc)
 
-include(externals/qpcCMakeSupport.txt)
+add_subdirectory(externals/cpputest-for-qpc)
 
 set(CMS_TEST_SUPPORT_TOP_DIR ${CMAKE_CURRENT_SOURCE_DIR}/test_support)
 set(MOCKS_TOP_DIR ${CMS_TEST_SUPPORT_TOP_DIR}/mocks)
 set(DRIVERS_TOP_DIR ${CMAKE_CURRENT_SOURCE_DIR}/drivers)
-set(CMS_UTILS_TOP_DIR ${CMAKE_CURRENT_SOURCE_DIR}/utilities)
 
-add_subdirectory(utilities)
-add_subdirectory(test_support)
+set(QP_CPP_INCLUDE_DIR ${CMS_QPC_TOP_DIR}/include)
+
 add_subdirectory(drivers)
 add_subdirectory(examples)

examples/hwLockCtrlService/CMakeLists.txt

@@ -7,4 +7,4 @@ target_include_directories(hwLockCtrlService PUBLIC include)
 # TODO: setting up QP should probably be a higher level build option
 add_compile_definitions(QACTIVE_CAN_STOP)
 include_directories(${QP_CPP_INCLUDE_DIR})
-include(${EXTERNALS_TOP_DIR}/qpcPosixPortCMakeSupport.txt)
+include(${CMS_CMAKE_DIR}/qpcPosixPortCMakeSupport.cmake)

examples/hwLockCtrlService/test/CMakeLists.txt

@@ -14,6 +14,6 @@ set(TEST_SOURCES
 
 # this include expects TEST_SOURCES and TEST_APP_NAME to be
 # defined, and creates the cpputest based test executable target
-include(${CMS_TEST_SUPPORT_TOP_DIR}/common/cpputestCMake.txt)
+include(${CMS_CMAKE_DIR}/cpputestCMake.cmake)
 
-target_link_libraries(${TEST_APP_NAME} cpputest-qpc-lib ${CPPUTEST_LDFLAGS})
+target_link_libraries(${TEST_APP_NAME} cpputest-for-qpc-lib ${CPPUTEST_LDFLAGS})