From d68a84b0fd1448911bc74408bb038510e3dd1858 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Mon, 5 Aug 2019 09:41:28 +0800 Subject: [PATCH] cmake: do not add gtest-parallel_ext if already added Signed-off-by: Kefu Chai --- cmake/modules/AddCephTest.cmake | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/cmake/modules/AddCephTest.cmake b/cmake/modules/AddCephTest.cmake index c121083888061..0e94f3f20ced8 100644 --- a/cmake/modules/AddCephTest.cmake +++ b/cmake/modules/AddCephTest.cmake @@ -25,19 +25,21 @@ endfunction() option(WITH_GTEST_PARALLEL "Enable running gtest based tests in parallel" OFF) if(WITH_GTEST_PARALLEL) - set(gtest_parallel_source_dir ${CMAKE_CURRENT_BINARY_DIR}/gtest-parallel) - include(ExternalProject) - ExternalProject_Add(gtest-parallel_ext - SOURCE_DIR "${gtest_parallel_source_dir}" - GIT_REPOSITORY "https://github.com/google/gtest-parallel.git" - GIT_TAG "master" - CONFIGURE_COMMAND "" - BUILD_COMMAND "" - INSTALL_COMMAND "") - add_dependencies(tests gtest-parallel_ext) - find_package(Python REQUIRED) - set(GTEST_PARALLEL_COMMAND - ${Python_EXECUTABLE} ${gtest_parallel_source_dir}/gtest-parallel) + if(NOT TARGET gtest-parallel_ext) + set(gtest_parallel_source_dir ${CMAKE_CURRENT_BINARY_DIR}/gtest-parallel) + include(ExternalProject) + ExternalProject_Add(gtest-parallel_ext + SOURCE_DIR "${gtest_parallel_source_dir}" + GIT_REPOSITORY "https://github.com/google/gtest-parallel.git" + GIT_TAG "master" + CONFIGURE_COMMAND "" + BUILD_COMMAND "" + INSTALL_COMMAND "") + add_dependencies(tests gtest-parallel_ext) + find_package(Python REQUIRED) + set(GTEST_PARALLEL_COMMAND + ${Python_EXECUTABLE} ${gtest_parallel_source_dir}/gtest-parallel) + endif() endif() #sets uniform compiler flags and link libraries -- 2.39.5