add CMS prefix to all internal cmake variables

Author: mattheweshleman

cpputest-for-qpc-lib/CMakeLists.txt

@@ -1,20 +1,18 @@
 include_directories(include)
+include_directories(${CMS_QPC_SRC_DIR})
+include_directories(${CMS_CPPUTEST_QP_PORT_TOP_DIR}/include)
 
-set(CPPUTEST_QP_PORT_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src)
-
-include_directories(${QPC_SRC_DIR})
-include_directories(${CPPUTEST_QP_PORT_TOP_DIR}/include)
-
-add_subdirectory(tests)
-add_library(cpputest-qpc-lib
+add_library(cpputest-for-qpc-lib
         src/cpputest_qf_port.cpp
         src/cms_cpputest_qf_ctrl.cpp
         src/cms_cpputest_q_onAssert.cpp
         src/cms_cpputest_qf_onCleanup.cpp
         src/cpputestMain.cpp
-        ${QPC_QF_SRCS})
+        ${CMS_QPC_QF_SRCS})
+
+add_subdirectory(tests)
 
-target_include_directories(cpputest-qpc-lib PUBLIC
-        ${QPC_INCLUDE_DIR}
-        ${CPPUTEST_QP_PORT_TOP_DIR}/include
+target_include_directories(cpputest-for-qpc-lib PUBLIC
+        ${CMS_QPC_INCLUDE_DIR}
+        ${CMS_CPPUTEST_QP_PORT_TOP_DIR}/include
         ${CMS_UTILS_TOP_DIR}/include)

cpputest-for-qpc-lib/cmake/qpcCMakeSupport.cmake

@@ -1,17 +1,17 @@
-set(QPC_SRC_DIR ${CMS_QPC_TOP_DIR}/src)
-set(QPC_INCLUDE_DIR ${CMS_QPC_TOP_DIR}/include)
-set(QPC_QF_SRC_DIR ${QPC_SRC_DIR}/qf)
+set(CMS_QPC_SRC_DIR ${CMS_QPC_TOP_DIR}/src)
+set(CMS_QPC_INCLUDE_DIR ${CMS_QPC_TOP_DIR}/include)
+set(CMS_QPC_QF_SRC_DIR ${CMS_QPC_SRC_DIR}/qf)
 
-set(QPC_QF_SRCS
-	${QPC_QF_SRC_DIR}/qep_hsm.c
-	${QPC_QF_SRC_DIR}/qep_msm.c
-	${QPC_QF_SRC_DIR}/qf_act.c
-	${QPC_QF_SRC_DIR}/qf_actq.c
-	${QPC_QF_SRC_DIR}/qf_defer.c
-	${QPC_QF_SRC_DIR}/qf_dyn.c
-	${QPC_QF_SRC_DIR}/qf_mem.c
-	${QPC_QF_SRC_DIR}/qf_ps.c
-	${QPC_QF_SRC_DIR}/qf_qact.c
-	${QPC_QF_SRC_DIR}/qf_qeq.c
-	${QPC_QF_SRC_DIR}/qf_qmact.c
-	${QPC_QF_SRC_DIR}/qf_time.c)
+set(CMS_QPC_QF_SRCS
+	${CMS_QPC_QF_SRC_DIR}/qep_hsm.c
+	${CMS_QPC_QF_SRC_DIR}/qep_msm.c
+	${CMS_QPC_QF_SRC_DIR}/qf_act.c
+	${CMS_QPC_QF_SRC_DIR}/qf_actq.c
+	${CMS_QPC_QF_SRC_DIR}/qf_defer.c
+	${CMS_QPC_QF_SRC_DIR}/qf_dyn.c
+	${CMS_QPC_QF_SRC_DIR}/qf_mem.c
+	${CMS_QPC_QF_SRC_DIR}/qf_ps.c
+	${CMS_QPC_QF_SRC_DIR}/qf_qact.c
+	${CMS_QPC_QF_SRC_DIR}/qf_qeq.c
+	${CMS_QPC_QF_SRC_DIR}/qf_qmact.c
+	${CMS_QPC_QF_SRC_DIR}/qf_time.c)

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

@@ -1,5 +1,5 @@
 
-set(TEST_APP_NAME cpputest-qpc-lib-tests)
+set(TEST_APP_NAME cpputest-for-qpc-lib-tests)
 set(TEST_SOURCES
         qassertTests.cpp
         cms_cpputest_qf_ctrlTests.cpp
@@ -12,4 +12,4 @@ set(TEST_SOURCES
 # defined, and creates the cpputest based test executable target
 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})