Skip to content

Commit 4698687

Browse files
substantial refactor/move of files transitioning this repo to a lib only repository.
1 parent feae199 commit 4698687

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+34
-1347
lines changed

CMakeLists.txt

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,18 @@
11
cmake_minimum_required(VERSION 3.16)
2-
project(cpputest-for-qpc)
2+
project(cpputest-for-qpc-lib)
33

44
set(CMAKE_CXX_STANDARD 14)
55
set(CMAKE_C_STANDARD 11)
66

77
add_compile_options(-Wall -Wextra -Werror)
88

9-
include_directories(include)
9+
set(CMS_EXTERNALS_TOP_DIR ${CMAKE_CURRENT_SOURCE_DIR}/externals)
10+
set(CMS_CMAKE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/cpputest-qpc-lib/cmake)
11+
set(CMS_QPC_TOP_DIR ${CMS_EXTERNALS_TOP_DIR}/qpc)
1012

11-
set(EXTERNALS_TOP_DIR ${CMAKE_CURRENT_SOURCE_DIR}/externals)
12-
set(CMS_QPC_TOP_DIR ${EXTERNALS_TOP_DIR}/qpc)
13-
14-
include(externals/qpcCMakeSupport.txt)
13+
include(${CMS_CMAKE_DIR}/qpcCMakeSupport.cmake)
1514

16-
set(CMS_TEST_SUPPORT_TOP_DIR ${CMAKE_CURRENT_SOURCE_DIR}/test_support)
17-
set(MOCKS_TOP_DIR ${CMS_TEST_SUPPORT_TOP_DIR}/mocks)
18-
set(DRIVERS_TOP_DIR ${CMAKE_CURRENT_SOURCE_DIR}/drivers)
19-
set(CMS_UTILS_TOP_DIR ${CMAKE_CURRENT_SOURCE_DIR}/utilities)
15+
# todo: if not set then use externals
16+
set(CMS_QPC_TOP_DIR ${EXTERNALS_TOP_DIR}/qpc)
2017

21-
add_subdirectory(utilities)
22-
add_subdirectory(test_support)
23-
add_subdirectory(drivers)
24-
add_subdirectory(examples)
18+
add_subdirectory(cpputest-qpc-lib)

cpputest-qpc-lib/CMakeLists.txt

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
include_directories(include)
2+
3+
set(CPPUTEST_QP_PORT_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src)
4+
5+
include_directories(${QPC_SRC_DIR})
6+
include_directories(${CPPUTEST_QP_PORT_TOP_DIR}/include)
7+
8+
add_subdirectory(tests)
9+
add_library(cpputest-qpc-lib
10+
src/cpputest_qf_port.cpp
11+
src/cms_cpputest_qf_ctrl.cpp
12+
src/cms_cpputest_q_onAssert.cpp
13+
src/cms_cpputest_qf_onCleanup.cpp
14+
src/cpputestMain.cpp
15+
${QPC_QF_SRCS})
16+
17+
target_include_directories(cpputest-qpc-lib PUBLIC
18+
${QPC_INCLUDE_DIR}
19+
${CPPUTEST_QP_PORT_TOP_DIR}/include
20+
${CMS_UTILS_TOP_DIR}/include)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

test_support/cpputest-qpc-port/include/cmsDummyActiveObject.hpp renamed to cpputest-qpc-lib/include/cmsDummyActiveObject.hpp

File renamed without changes.

test_support/cpputest-qpc-port/include/cmsTestPublishedEventRecorder.hpp renamed to cpputest-qpc-lib/include/cmsTestPublishedEventRecorder.hpp

File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)