From bec0d82328a2933c95b668c6f4ccb87f4eb38d17 Mon Sep 17 00:00:00 2001 From: bergmann Date: Thu, 1 Aug 2019 20:30:46 +0200 Subject: [PATCH] * Fixed variable naming --- projects/helloworld/test/CMakeLists.txt | 12 ++++++------ projects/libhelloworld/test/CMakeLists.txt | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/projects/helloworld/test/CMakeLists.txt b/projects/helloworld/test/CMakeLists.txt index 6b522ef..871f01d 100644 --- a/projects/helloworld/test/CMakeLists.txt +++ b/projects/helloworld/test/CMakeLists.txt @@ -11,15 +11,15 @@ If ( NOT "${GTest_FOUND}" ) Return ( ) EndIf ( ) -File ( GLOB_RECURSE ISEF_TEST_HEADER_FILES +File ( GLOB_RECURSE HELLOWORLD_TEST_HEADER_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.h ) -File ( GLOB_RECURSE ISEF_TEST_INLINE_FILES +File ( GLOB_RECURSE HELLOWORLD_TEST_INLINE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.inl ) -File ( GLOB_RECURSE ISEF_TEST_SOURCE_FILES +File ( GLOB_RECURSE HELLOWORLD_TEST_SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp ) -ForEach ( FILE IN LISTS ISEF_TEST_SOURCE_FILES ) +ForEach ( FILE IN LISTS HELLOWORLD_TEST_SOURCE_FILES ) # add test Get_Filename_Component ( TEST_DIR ${FILE} DIRECTORY ) Get_Filename_Component ( TEST_NAME ${FILE} NAME_WE ) @@ -30,8 +30,8 @@ ForEach ( FILE IN LISTS ISEF_TEST_SOURCE_FILES ) Set ( TEST_NAME "test-${TEST_NAME}" ) Add_Executable ( ${TEST_NAME} EXCLUDE_FROM_ALL - ${ISEF_TEST_HEADER_FILES} - ${ISEF_TEST_INLINE_FILES} + ${HELLOWORLD_TEST_HEADER_FILES} + ${HELLOWORLD_TEST_INLINE_FILES} ${FILE} ) Target_Link_Libraries ( ${TEST_NAME} PUBLIC diff --git a/projects/libhelloworld/test/CMakeLists.txt b/projects/libhelloworld/test/CMakeLists.txt index 42e518f..93c4b39 100644 --- a/projects/libhelloworld/test/CMakeLists.txt +++ b/projects/libhelloworld/test/CMakeLists.txt @@ -11,15 +11,15 @@ If ( NOT "${GTest_FOUND}" ) Return ( ) EndIf ( ) -File ( GLOB_RECURSE ISEF_TEST_HEADER_FILES +File ( GLOB_RECURSE LIBHELLOWORLD_TEST_HEADER_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.h ) -File ( GLOB_RECURSE ISEF_TEST_INLINE_FILES +File ( GLOB_RECURSE LIBHELLOWORLD_TEST_INLINE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.inl ) -File ( GLOB_RECURSE ISEF_TEST_SOURCE_FILES +File ( GLOB_RECURSE LIBHELLOWORLD_TEST_SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp ) -ForEach ( FILE IN LISTS ISEF_TEST_SOURCE_FILES ) +ForEach ( FILE IN LISTS LIBHELLOWORLD_TEST_SOURCE_FILES ) # add test Get_Filename_Component ( TEST_DIR ${FILE} DIRECTORY ) Get_Filename_Component ( TEST_NAME ${FILE} NAME_WE ) @@ -30,8 +30,8 @@ ForEach ( FILE IN LISTS ISEF_TEST_SOURCE_FILES ) Set ( TEST_NAME "test-${TEST_NAME}" ) Add_Executable ( ${TEST_NAME} EXCLUDE_FROM_ALL - ${ISEF_TEST_HEADER_FILES} - ${ISEF_TEST_INLINE_FILES} + ${LIBHELLOWORLD_TEST_HEADER_FILES} + ${LIBHELLOWORLD_TEST_INLINE_FILES} ${FILE} ) Target_Link_Libraries ( ${TEST_NAME} PUBLIC