Skip to content

Commit 5d178a7

Browse files
authored
Test GitHub subs (#45)
* Static library of timemeasurer has been added
1 parent 244baf8 commit 5d178a7

File tree

5 files changed

+18
-102
lines changed

5 files changed

+18
-102
lines changed

CMakeLists.txt

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,22 @@ if(NOT googletest_POPULATED)
8989
add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BUILD_DIR})
9090
endif()
9191

92+
##get timemeasurer
93+
include(FetchContent)
94+
FetchContent_Declare(timemeasurer
95+
GIT_REPOSITORY https://github.com/zproksi/timemeasurer
96+
GIT_TAG 12d04cd406960c8b75af79c476ab0037332a68b4)
97+
FetchContent_MakeAvailable(timemeasurer)
98+
#FetchContent_GetProperties(timemeasurer)
99+
#timemeasurer_POPULATED
100+
#timemeasurer_SOURCE_DIR
101+
#timemeasurer_BUILD_DIR
102+
if(NOT timemeasurer_POPULATED)
103+
FetchContent_Populate(timemeasurer)
104+
add_subdirectory(${timemeasurer_SOURCE_DIR} ${timemeasurer_BUILD_DIR})
105+
endif()
106+
include_directories(${timemeasurer_SOURCE_DIR})
107+
92108
include_directories(${wild_library})
93109
include_directories(src${pname})
94110

@@ -135,7 +151,7 @@ add_subdirectory(${wild_library})
135151
add_subdirectory(src${pname})
136152
add_subdirectory(test${pname})
137153

138-
target_link_libraries(${pname} src${pname} ${wild_library})
154+
target_link_libraries(${pname} src${pname} ${wild_library} timemeasurer)
139155

140156
# Console commands for building on Windows with Visual Studio
141157
# !!!!!!!!!!!!!

srcbpatch/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ set(SOURCE_FILES
2020
processing.cpp
2121
stdafx.cpp
2222
streamreplacer.cpp
23-
timemeasurer.cpp
2423
)
2524
set(HEADER_FILES
2625
actionscollection.h
@@ -36,7 +35,6 @@ set(HEADER_FILES
3635
processing.h
3736
stdafx.h
3837
streamreplacer.h
39-
timemeasurer.h
4038
)
4139

4240
# Define the executable target

srcbpatch/timemeasurer.cpp

Lines changed: 0 additions & 46 deletions
This file was deleted.

srcbpatch/timemeasurer.h

Lines changed: 0 additions & 52 deletions
This file was deleted.

testbpatch/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ endif()
3333
# Precompiled header
3434
target_precompile_headers(${PROJECT_NAME} PRIVATE pch.h)
3535

36-
target_link_libraries(${PROJECT_NAME} PRIVATE wildcharacters src${pname} gtest_main gmock_main)
36+
target_link_libraries(${PROJECT_NAME} PRIVATE timemeasurer wildcharacters src${pname} gtest_main gmock_main)

0 commit comments

Comments
 (0)