File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -5,8 +5,6 @@ include(FetchContent)
55set (CMAKE_CXX_STANDARD 17)
66set (CMAKE_C_STANDARD 11)
77
8- add_compile_options (-Wall -Wextra -Werror )
9-
108set (CMS_EXTERNALS_TOP_DIR ${CMAKE_CURRENT_SOURCE_DIR } /externals)
119set (CMS_CMAKE_DIR ${CMAKE_CURRENT_SOURCE_DIR } /cpputest-for-qpcpp-lib/cmake CACHE INTERNAL "" )
1210set (CMS_QASSERT_META_TOP_DIR ${CMS_EXTERNALS_TOP_DIR} /qassert-meta)
Original file line number Diff line number Diff line change @@ -11,15 +11,20 @@ add_library(cpputest-for-qpcpp-lib
1111 src/cms_cpputest_qf_ctrl.cpp
1212 src/cms_cpputest_q_onAssert.cpp
1313 src/cms_cpputest_qf_onCleanup.cpp
14- src/cpputestMain.cpp
15- ${CMS_QPCPP_QF_SRCS} )
14+ src/cpputestMain.cpp)
1615
17- target_link_libraries(cpputest-for-qpcpp-lib qassert-meta-lib)
16+ add_library(cms-qpcpp ${CMS_QPCPP_QF_SRCS} )
17+
18+ target_link_libraries(cpputest-for-qpcpp-lib qassert-meta-lib cms-qpcpp)
1819
1920target_compile_options(cpputest-for-qpcpp-lib PRIVATE -Wall -Wextra -Werror -Wpedantic -Wold-style-cast -Wsign-conversion)
2021
22+ target_compile_options(cms-qpcpp PRIVATE -Wall -Wextra -Werror -Wpedantic -Wold-style-cast -Wsign-conversion)
23+
2124target_include_directories(cpputest-for-qpcpp-lib PUBLIC
2225 ${CMS_QPCPP_INCLUDE_DIR}
2326 include)
2427
28+ target_include_directories(cms-qpcpp PUBLIC ${CMS_QPCPP_INCLUDE_DIR} )
29+
2530add_subdirectory(tests)
Original file line number Diff line number Diff line change 11
2+ add_compile_options (-Wall -Wextra -Werror -Wpedantic -Wold-style-cast -Wsign-conversion )
3+
24# prep for cpputest based build
35set (TEST_APP_NAME cpputest-for-qpcpp-lib-tests)
46set (TEST_SOURCES
You can’t perform that action at this time.
0 commit comments