From e46af93bcc91a1f5660c22ade7c9dedead5a772a Mon Sep 17 00:00:00 2001 From: gcontini <1121667+gcontini@users.noreply.github.com> Date: 周六, 30 11月 2019 23:24:58 +0800 Subject: [PATCH] fix centos --- cmake/Findlcc.cmake | 91 ++++++++++++++++++++++----------------------- 1 files changed, 45 insertions(+), 46 deletions(-) diff --git a/cmake/Findlcc.cmake b/cmake/Findlcc.cmake index 48c02a4..b917f63 100644 --- a/cmake/Findlcc.cmake +++ b/cmake/Findlcc.cmake @@ -1,45 +1,44 @@ -# Distributed under the OSI-approved BSD 3-Clause License. See accompanying -# file Copyright.txt or https://cmake.org/licensing for details. +# Distributed under the OSI-approved BSD 3-Clause License. #[=======================================================================[.rst: -Findlcc -------- - -Find or build the lcc executable. - -Imported Targets -^^^^^^^^^^^^^^^^ - -This module provides the following imported targets, if found: - -``license_generator::lcc`` - The lcc executable - -If lcc is not found this module will try to download it as a submodule -Git must be installed. - -Input variables -^^^^^^^^^^^^^^^^ - -``LCC_LOCATION`` Hint for locating the lcc executable - -Result Variables -^^^^^^^^^^^^^^^^ - -This will define the following variables: - -``LCC_FOUND`` - True if the system has the Foo library. -``lcc_VERSION`` - -Cache Variables -^^^^^^^^^^^^^^^ - -The following cache variables will also be set: - -``LCC_EXECUTABLE`` - Path to the lcc executable. - +#Findlcc +#------- +# +#Find or build the lcc executable. +# +#Imported Targets +#^^^^^^^^^^^^^^^^ +# +#This module provides the following imported targets, if found: +# +#``license_generator::lcc`` +# The lcc executable +# +#If lcc is not found this module will try to download it as a submodule +#Git must be installed. +# +#Input variables +#^^^^^^^^^^^^^^^^ +# +#``LCC_LOCATION`` Hint for locating the lcc executable +# +#Result Variables +#^^^^^^^^^^^^^^^^ +# +#This will define the following variables: +# +#``LCC_FOUND`` +# True if the system has the Foo library. +#``lcc_VERSION`` +# +#Cache Variables +#^^^^^^^^^^^^^^^ +# +#The following cache variables will also be set: +# +#``LCC_EXECUTABLE`` +# Path to the lcc executable. +# #]=======================================================================] set(lcc_names lcc lcc.exe) @@ -65,12 +64,12 @@ option(GIT_SUBMODULE "Check submodules during build" ON) if(GIT_SUBMODULE) message(STATUS "Submodule update") -# execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive -# WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} -# RESULT_VARIABLE GIT_SUBMOD_RESULT) -# if(NOT GIT_SUBMOD_RESULT EQUAL "0") -# set(failure_messge "git submodule update --init failed with ${GIT_SUBMOD_RESULT}, please checkout submodules") -# endif() + execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + RESULT_VARIABLE GIT_SUBMOD_RESULT) + if(NOT GIT_SUBMOD_RESULT EQUAL "0") + set(failure_messge "git submodule update --init failed with ${GIT_SUBMOD_RESULT}, please checkout submodules") + endif() endif() endif() if(NOT EXISTS "${PROJECT_SOURCE_DIR}/extern/license-generator/CMakeLists.txt") -- Gitblit v1.9.1