From 1df06093305260662a9946b789d63b9fcc0aa9e2 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Thu, 26 Mar 2020 14:35:32 +0100 Subject: [PATCH] Add cmake version limit to use verbose command --- CMakeLists.txt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0e8b0b248..023e88cae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -108,14 +108,16 @@ list(APPEND APP_OPTIONS "-DLINPHONE_OUTPUT_DIR=${LINPHONE_OUTPUT_DIR}") include(ExternalProject) set(PROJECT_BUILD_COMMAND "") if(CMAKE_BUILD_PARALLEL_LEVEL) - list(APPEND APP_OPTIONS "-DCMAKE_BUILD_PARALLEL_LEVEL=${CMAKE_BUILD_PARALLEL_LEVEL}") - if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.12.0") #CMAKE_BUILD_PARALLEL_LEVEL will not always work for External projects - list(APPEND PROJECT_BUILD_COMMAND "--parallel" "${CMAKE_BUILD_PARALLEL_LEVEL}") - endif() + list(APPEND APP_OPTIONS "-DCMAKE_BUILD_PARALLEL_LEVEL=${CMAKE_BUILD_PARALLEL_LEVEL}") + if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.12.0") #CMAKE_BUILD_PARALLEL_LEVEL will not always work for External projects + list(APPEND PROJECT_BUILD_COMMAND "--parallel" "${CMAKE_BUILD_PARALLEL_LEVEL}") + endif() endif() if(CMAKE_VERBOSE_MAKEFILE) - list(APPEND APP_OPTIONS "-DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE_MAKEFILE}") - list(APPEND PROJECT_BUILD_COMMAND "--verbose") + list(APPEND APP_OPTIONS "-DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE_MAKEFILE}") + if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.14.0") + list(APPEND PROJECT_BUILD_COMMAND "--verbose") + endif() endif() message("User Args : ${USER_ARGS}")