Merge pull request #1 from covemountainsoftware/feature/more-unique-cmake-variables

Feature/more unique cmake variables

Author: mattheweshleman

CMakeLists.txt

@@ -9,12 +9,11 @@ add_compile_options(-Wall -Wextra -Werror)
 include_directories(include)
 include(externals/qpcCMakeSupport.txt)
 
-set(TEST_SUPPORT_TOP_DIR ${CMAKE_CURRENT_SOURCE_DIR}/test_support)
-set(MOCKS_TOP_DIR ${TEST_SUPPORT_TOP_DIR}/mocks)
+set(CMS_TEST_SUPPORT_TOP_DIR ${CMAKE_CURRENT_SOURCE_DIR}/test_support)
+set(MOCKS_TOP_DIR ${CMS_TEST_SUPPORT_TOP_DIR}/mocks)
 set(EXTERNALS_TOP_DIR ${CMAKE_CURRENT_SOURCE_DIR}/externals)
-set(QPC_TOP_DIR ${CMAKE_CURRENT_SOURCE_DIR}/externals/qpc)
 set(DRIVERS_TOP_DIR ${CMAKE_CURRENT_SOURCE_DIR}/drivers)
-set(UTILS_TOP_DIR ${CMAKE_CURRENT_SOURCE_DIR}/utilities)
+set(CMS_UTILS_TOP_DIR ${CMAKE_CURRENT_SOURCE_DIR}/utilities)
 
 add_subdirectory(utilities)
 add_subdirectory(test_support)

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(${TEST_SUPPORT_TOP_DIR}/common/cpputestCMake.txt)
+include(${CMS_TEST_SUPPORT_TOP_DIR}/common/cpputestCMake.txt)
 
 target_link_libraries(${TEST_APP_NAME} cpputest-qpc-lib ${CPPUTEST_LDFLAGS})

test_support/cpputest-qpc-port/CMakeLists.txt

@@ -1,5 +1,5 @@
 
-set(CPPUTEST_QP_PORT_TOP_DIR ${TEST_SUPPORT_TOP_DIR}/cpputest-qpc-port)
+set(CPPUTEST_QP_PORT_TOP_DIR ${CMS_TEST_SUPPORT_TOP_DIR}/cpputest-qpc-port)
 set(CPPUTEST_QP_PORT_SRC_DIR ${CPPUTEST_QP_PORT_TOP_DIR}/src)
 set(CPPUTEST_QP_PORT_SRC_FILES
         ${CPPUTEST_QP_PORT_SRC_DIR}/cpputest_qf_port.cpp
@@ -11,14 +11,14 @@ set(CPPUTEST_QP_PORT_SRC_FILES
 
 include_directories(${QPC_SRC_DIR})
 include_directories(${CPPUTEST_QP_PORT_TOP_DIR}/include)
-include_directories(${UTILS_TOP_DIR}/include)
+include_directories(${CMS_UTILS_TOP_DIR}/include)
 
 add_subdirectory(test)
 add_library(cpputest-qpc-lib  ${CPPUTEST_QP_PORT_SRC_FILES} ../common/cpputestMain.cpp)
 target_include_directories(cpputest-qpc-lib PUBLIC
         ${QPC_INCLUDE_DIR}
         ${CPPUTEST_QP_PORT_TOP_DIR}/include
-        ${UTILS_TOP_DIR}/include)
+        ${CMS_UTILS_TOP_DIR}/include)
 
 
 

test_support/cpputest-qpc-port/test/CMakeLists.txt

@@ -9,6 +9,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(${TEST_SUPPORT_TOP_DIR}/common/cpputestCMake.txt)
+include(${CMS_TEST_SUPPORT_TOP_DIR}/common/cpputestCMake.txt)
 
 target_link_libraries(${TEST_APP_NAME} cpputest-qpc-lib  ${CPPUTEST_LDFLAGS})

utilities/test/CMakeLists.txt

@@ -8,6 +8,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(${TEST_SUPPORT_TOP_DIR}/common/cpputestCMake.txt)
+include(${CMS_TEST_SUPPORT_TOP_DIR}/common/cpputestCMake.txt)
 
 target_link_libraries(${TEST_APP_NAME} cpputest-qpc-lib ${CPPUTEST_LDFLAGS})