Skip to content

Commit 4d0c46e

Browse files
input output cmake changes
1 parent ef949f3 commit 4d0c46e

File tree

2 files changed

+32
-12
lines changed

2 files changed

+32
-12
lines changed

.github/workflows/L1-tests.yml

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,14 @@ jobs:
121121
with:
122122
path: entservices-inputoutput
123123

124+
- name: Checkout googletest
125+
if: steps.cache.outputs.cache-hit != 'true'
126+
uses: actions/checkout@v3
127+
with:
128+
repository: google/googletest
129+
path: googletest
130+
ref: v1.15.0
131+
124132
- name: Apply patches ThunderTools
125133
run: |
126134
cd $GITHUB_WORKSPACE/ThunderTools
@@ -343,6 +351,22 @@ jobs:
343351
&&
344352
cmake --install build/mocks
345353
354+
- name: Build googletest
355+
if: steps.cache.outputs.cache-hit != 'true'
356+
run: >
357+
cmake -G Ninja
358+
-S "$GITHUB_WORKSPACE/googletest"
359+
-B build/googletest
360+
-DCMAKE_INSTALL_PREFIX="$GITHUB_WORKSPACE/install/usr"
361+
-DCMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake"
362+
-DGENERIC_CMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake"
363+
-DBUILD_TYPE=Debug
364+
-DBUILD_GMOCK=ON
365+
&&
366+
cmake --build build/googletest -j8
367+
&&
368+
cmake --install build/googletest
369+
346370
- name: Build entservices-inputoutput
347371
run: >
348372
cmake -G Ninja
@@ -369,6 +393,8 @@ jobs:
369393
-I $GITHUB_WORKSPACE/entservices-testframework/Tests
370394
-I $GITHUB_WORKSPACE/Thunder/Source
371395
-I $GITHUB_WORKSPACE/Thunder/Source/core
396+
-I $GITHUB_WORKSPACE/install/usr/include
397+
-I $GITHUB_WORKSPACE/install/usr/include/WPEFramework
372398
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/devicesettings.h
373399
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/Iarm.h
374400
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/Rfc.h
@@ -444,6 +470,8 @@ jobs:
444470
-I $GITHUB_WORKSPACE/entservices-testframework/Tests
445471
-I $GITHUB_WORKSPACE/Thunder/Source
446472
-I $GITHUB_WORKSPACE/Thunder/Source/core
473+
-I $GITHUB_WORKSPACE/install/usr/include
474+
-I $GITHUB_WORKSPACE/install/usr/include/WPEFramework
447475
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/devicesettings.h
448476
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/Iarm.h
449477
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/Rfc.h
@@ -460,7 +488,7 @@ jobs:
460488
-include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/thunder/Communicator.h
461489
--coverage
462490
-Wall -Wno-unused-result -Wno-deprecated-declarations -Wno-error=format=
463-
-Wl,-wrap,system -Wl,-wrap,popen -Wl,-wrap,syslog
491+
-Wl,-wrap,system -Wl,-wrap,popen -Wl,-wrap,syslog -Wl,--no-as-needed
464492
-DENABLE_TELEMETRY_LOGGING
465493
-DUSE_IARMBUS
466494
-DENABLE_SYSTEM_GET_STORE_DEMO_LINK

Tests/L1Tests/CMakeLists.txt

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,16 @@ cmake_minimum_required(VERSION 3.8)
1919
set(PLUGIN_NAME L1TestsIO)
2020
set(MODULE_NAME ${NAMESPACE}${PLUGIN_NAME})
2121

22-
set(CMAKE_CXX_STANDARD 11)
22+
set(CMAKE_CXX_STANDARD 14)
23+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
2324

2425
find_package(${NAMESPACE}Plugins REQUIRED)
2526

2627
set (TEST_SRC
2728
tests/test_UtilsFile.cpp
2829
)
2930

30-
include(FetchContent)
31-
FetchContent_Declare(
32-
googletest
33-
URL https://github.com/google/googletest/archive/e39786088138f2749d64e9e90e0f9902daa77c40.zip
34-
)
35-
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
36-
FetchContent_MakeAvailable(googletest)
37-
3831
set (TEST_LIB
39-
gmock_main
4032
${NAMESPACE}Plugins::${NAMESPACE}Plugins
4133
)
4234

@@ -148,7 +140,7 @@ endif (RDK_SERVICES_L1_TEST)
148140

149141
include_directories(${TEST_INC})
150142

151-
target_link_directories(${MODULE_NAME} PUBLIC ${CMAKE_INSTALL_PREFIX}/lib/wpeframework/plugins)
143+
target_link_directories(${MODULE_NAME} PUBLIC ${CMAKE_INSTALL_PREFIX}/lib ${CMAKE_INSTALL_PREFIX}/lib/wpeframework/plugins)
152144

153145
target_link_libraries(${MODULE_NAME} ${TEST_LIB})
154146

0 commit comments

Comments
 (0)