feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CMake Build: Add Google Testing 1.10.x as submodule

Browse Source 
Fixes: QTCREATORBUG-24510
Change-Id: I763d72524f2e581671e18bcd9cda42d5bf7bccdf
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Cristian Adam
2020-08-19 13:45:48 +02:00
parent eb0d2518f9
commit d6c3846ab1
4 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
.github/workflows/build_cmake.yml vendored
View File

@@ -10,7 +10,6 @@ env:
NINJA_VERSION: 1.10.0 NINJA_VERSION: 1.10.0
BUILD_TYPE: Release BUILD_TYPE: Release
CCACHE_VERSION: 3.7.7 CCACHE_VERSION: 3.7.7
GOOGLETEST_VERSION: 1.10.0
jobs: jobs:
build: build:
@@ -51,6 +50,7 @@ jobs:
git submodule set-url -- perfparser https://code.qt.io/qt-creator/perfparser.git git submodule set-url -- perfparser https://code.qt.io/qt-creator/perfparser.git
git submodule update --init src/plugins/help/qlitehtml/litehtml git submodule update --init src/plugins/help/qlitehtml/litehtml
git submodule update --init src/tools/perfparser git submodule update --init src/tools/perfparser
git submodule update --init tests/unit/unittest/3rdparty/googletest
- name: Download Ninja and CMake - name: Download Ninja and CMake
id: cmake_and_ninja id: cmake_and_ninja
@@ -330,16 +330,6 @@ jobs:
endif() endif()
endif() endif()
- name: Download Googletest
id: googletest
shell: cmake -P {0}
run: |
# Googletest should be a submodule
file(DOWNLOAD "https://github.com/google/googletest/archive/release-$ENV{GOOGLETEST_VERSION}.tar.gz" ./googletest.tar.gz SHOW_PROGRESS)
execute_process(COMMAND ${CMAKE_COMMAND} -E tar xf googletest.tar.gz)
file(TO_CMAKE_PATH "$ENV{GITHUB_WORKSPACE}/googletest-release-$ENV{GOOGLETEST_VERSION}" googletest_dir)
message("::set-output name=googletest_dir::${googletest_dir}")
- name: Build - name: Build
shell: cmake -P {0} shell: cmake -P {0}
run: | run: |
@@ -366,8 +356,6 @@ jobs:
endif() endif()
set(ENV{PATH} "${{ steps.cmake_and_ninja.outputs.cmake_dir }}${path_separator}$ENV{GITHUB_WORKSPACE}${path_separator}$ENV{PATH}") set(ENV{PATH} "${{ steps.cmake_and_ninja.outputs.cmake_dir }}${path_separator}$ENV{GITHUB_WORKSPACE}${path_separator}$ENV{PATH}")
set(ENV{GOOGLETEST_DIR} "${{ steps.googletest.outputs.googletest_dir }}")
set(ENV{NINJA_STATUS} "[%f/%t %o/sec] ") set(ENV{NINJA_STATUS} "[%f/%t %o/sec] ")
file(TO_CMAKE_PATH "$ENV{GITHUB_WORKSPACE}" ccache_basedir) file(TO_CMAKE_PATH "$ENV{GITHUB_WORKSPACE}" ccache_basedir)

4
.gitmodules vendored
View File

@@ -11,3 +11,7 @@
path = src/plugins/help/qlitehtml/litehtml path = src/plugins/help/qlitehtml/litehtml
url = https://github.com/litehtml/litehtml.git url = https://github.com/litehtml/litehtml.git
branch = master branch = master
[submodule "googletest"]
path = tests/unit/unittest/3rdparty/googletest
url = https://github.com/google/googletest.git
branch = v1.10.x

28
cmake/FindGoogletest.cmake
View File

@@ -22,9 +22,10 @@ find_path(GOOGLE_TEST_INCLUDE_DIR
PATH_SUFFIXES googletest/include PATH_SUFFIXES googletest/include
HINTS HINTS
"${GOOGLETEST_DIR}" ENV GOOGLETEST_DIR "${GOOGLETEST_DIR}" ENV GOOGLETEST_DIR
"${CMAKE_SOURCE_DIR}/googletest" "${PROJECT_SOURCE_DIR}/googletest"
"${CMAKE_SOURCE_DIR}/../googletest" "${PROJECT_SOURCE_DIR}/../googletest"
"${CMAKE_SOURCE_DIR}/../../googletest" "${PROJECT_SOURCE_DIR}/../../googletest"
"${PROJECT_SOURCE_DIR}/tests/unit/unittest/3rdparty/googletest"
) )
find_path(GOOGLE_TEST_SRC_ALL find_path(GOOGLE_TEST_SRC_ALL
@@ -32,9 +33,10 @@ find_path(GOOGLE_TEST_SRC_ALL
PATH_SUFFIXES googletest/src PATH_SUFFIXES googletest/src
HINTS HINTS
"${GOOGLETEST_DIR}" ENV GOOGLETEST_DIR "${GOOGLETEST_DIR}" ENV GOOGLETEST_DIR
"${CMAKE_SOURCE_DIR}/googletest" "${PROJECT_SOURCE_DIR}/googletest"
"${CMAKE_SOURCE_DIR}/../googletest" "${PROJECT_SOURCE_DIR}/../googletest"
"${CMAKE_SOURCE_DIR}/../../googletest" "${PROJECT_SOURCE_DIR}/../../googletest"
"${PROJECT_SOURCE_DIR}/tests/unit/unittest/3rdparty/googletest"
) )
@@ -43,9 +45,10 @@ find_path(GOOGLE_MOCK_INCLUDE_DIR
PATH_SUFFIXES googlemock/include PATH_SUFFIXES googlemock/include
HINTS HINTS
"${GOOGLETEST_DIR}" ENV GOOGLETEST_DIR "${GOOGLETEST_DIR}" ENV GOOGLETEST_DIR
"${CMAKE_SOURCE_DIR}/googletest" "${PROJECT_SOURCE_DIR}/googletest"
"${CMAKE_SOURCE_DIR}/../googletest" "${PROJECT_SOURCE_DIR}/../googletest"
"${CMAKE_SOURCE_DIR}/../../googletest" "${PROJECT_SOURCE_DIR}/../../googletest"
"${PROJECT_SOURCE_DIR}/tests/unit/unittest/3rdparty/googletest"
) )
find_path(GOOGLE_MOCK_SRC_ALL find_path(GOOGLE_MOCK_SRC_ALL
@@ -53,9 +56,10 @@ find_path(GOOGLE_MOCK_SRC_ALL
PATH_SUFFIXES googlemock/src PATH_SUFFIXES googlemock/src
HINTS HINTS
"${GOOGLETEST_DIR}" ENV GOOGLETEST_DIR "${GOOGLETEST_DIR}" ENV GOOGLETEST_DIR
"${CMAKE_SOURCE_DIR}/googletest" "${PROJECT_SOURCE_DIR}/googletest"
"${CMAKE_SOURCE_DIR}/../googletest" "${PROJECT_SOURCE_DIR}/../googletest"
"${CMAKE_SOURCE_DIR}/../../googletest" "${PROJECT_SOURCE_DIR}/../../googletest"
"${PROJECT_SOURCE_DIR}/tests/unit/unittest/3rdparty/googletest"
) )
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)

1
tests/unit/unittest/3rdparty/googletest vendored Submodule

Submodule tests/unit/unittest/3rdparty/googletest added at 6a7ed316a5