Skip to content

Commit 2f1615e

Browse files
separate out build and warnings
prep for newer version of QP
1 parent 86b034e commit 2f1615e

3 files changed

Lines changed: 10 additions & 5 deletions

File tree

CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ include(FetchContent)
55
set(CMAKE_CXX_STANDARD 17)
66
set(CMAKE_C_STANDARD 11)
77

8-
add_compile_options(-Wall -Wextra -Werror)
9-
108
set(CMS_EXTERNALS_TOP_DIR ${CMAKE_CURRENT_SOURCE_DIR}/externals)
119
set(CMS_CMAKE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/cpputest-for-qpcpp-lib/cmake CACHE INTERNAL "")
1210
set(CMS_QASSERT_META_TOP_DIR ${CMS_EXTERNALS_TOP_DIR}/qassert-meta)

cpputest-for-qpcpp-lib/CMakeLists.txt

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff 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
1920
target_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+
2124
target_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+
2530
add_subdirectory(tests)

cpputest-for-qpcpp-lib/tests/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11

2+
add_compile_options(-Wall -Wextra -Werror -Wpedantic -Wold-style-cast -Wsign-conversion)
3+
24
# prep for cpputest based build
35
set(TEST_APP_NAME cpputest-for-qpcpp-lib-tests)
46
set(TEST_SOURCES

0 commit comments

Comments
 (0)