From 488ef000122d36c03740b504a5c9e5a59631f95c Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Tue, 29 Jun 2021 11:23:46 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20=D0=BF=D0=BE=D0=B8=D1=81=D0=BA=20=D0=BA=D0=B0?= =?UTF-8?q?=D1=82=D0=B0=D0=BB=D0=BE=D0=B3=D0=BE=D0=B2=20(=D0=B2=20=D0=BF?= =?UTF-8?q?=D1=80=D0=BE=D1=86=D0=B5=D1=81=D1=81=D0=B5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FindFsp.cmake | 12 ++++++------ FindIonobase.cmake | 12 ++++++------ FindPreprocmath.cmake | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/FindFsp.cmake b/FindFsp.cmake index dd4f518..bf0f2bc 100644 --- a/FindFsp.cmake +++ b/FindFsp.cmake @@ -4,11 +4,11 @@ if(NOT FSP_IS_EXTERNAL_PROJECT) set(FSP_LIBRARY_DIR "" CACHE PATH "The path to the library of an libfsp installation") set(_search_paths "") - if(EXISTS FSP_INCLUDE_DIR) + if(FSP_INCLUDE_DIR AND EXISTS ${FSP_INCLUDE_DIR}) list(APPEND _search_paths ${FSP_INCLUDE_DIR}) endif() - if(EXISTS FSP_PREFIX) - list(APPEND _search_paths ${FSP_PREFIX}/include) + if(FSP_PREFIX AND EXISTS ${FSP_PREFIX}) + list(APPEND _search_paths "${FSP_PREFIX}/include") endif() find_path( FSP_INCLUDE_DIRS @@ -16,11 +16,11 @@ if(NOT FSP_IS_EXTERNAL_PROJECT) PATHS ${_search_paths}) set(_search_paths "") - if(EXISTS FSP_LIBRARY_DIR) + if(FSP_LIBRARY_DIR AND EXISTS ${FSP_LIBRARY_DIR}) list(APPEND _search_paths ${FSP_LIBRARY_DIR}) endif() - if(EXISTS FSP_PREFIX) - list(APPEND _search_paths ${FSP_PREFIX}/lib) + if(FSP_PREFIX AND EXISTS ${FSP_PREFIX}) + list(APPEND _search_paths "${FSP_PREFIX}/lib") endif() find_library( FSP_LIBRARIES diff --git a/FindIonobase.cmake b/FindIonobase.cmake index b54c560..0645d47 100644 --- a/FindIonobase.cmake +++ b/FindIonobase.cmake @@ -4,11 +4,11 @@ if(NOT IONOBASE_IS_EXTERNAL_PROJECT) set(IONOBASE_LIBRARY_DIR "" CACHE PATH "The path to the library of an libionobase installation") set(_search_paths "") - if(EXISTS IONOBASE_INCLUDE_DIR) + if(IONOBASE_INCLUDE_DIR AND EXISTS ${IONOBASE_INCLUDE_DIR}) list(APPEND _search_paths ${IONOBASE_INCLUDE_DIR}) endif() - if(EXISTS IONOBASE_PREFIX) - list(APPEND _search_paths ${IONOBASE_PREFIX}/include) + if(IONOBASE_PREFIX AND EXISTS ${IONOBASE_PREFIX}) + list(APPEND _search_paths "${IONOBASE_PREFIX}/include") endif() find_path( IONOBASE_INCLUDE_DIRS @@ -16,11 +16,11 @@ if(NOT IONOBASE_IS_EXTERNAL_PROJECT) PATHS ${_search_paths}) set(_search_paths "") - if(EXISTS IONOBASE_LIBRARY_DIR) + if(IONOBASE_LIBRARY_DIR AND EXISTS ${IONOBASE_LIBRARY_DIR}) list(APPEND _search_paths ${IONOBASE_LIBRARY_DIR}) endif() - if(EXISTS IONOBASE_PREFIX) - list(APPEND _search_paths ${IONOBASE_PREFIX}/lib) + if(IONOBASE_PREFIX AND EXISTS ${IONOBASE_PREFIX}) + list(APPEND _search_paths "${IONOBASE_PREFIX}/lib") endif() find_library( IONOBASE_LIBRARIES diff --git a/FindPreprocmath.cmake b/FindPreprocmath.cmake index 935673b..81c7600 100644 --- a/FindPreprocmath.cmake +++ b/FindPreprocmath.cmake @@ -4,11 +4,11 @@ if(NOT PREPROCMATH_IS_EXTERNAL_PROJECT) set(PREPROCMATH_LIBRARY_DIR "" CACHE PATH "The path to the library of an libpreprocmath installation") set(_search_paths "") - if(EXISTS PREPROCMATH_INCLUDE_DIR) + if(PREPROCMATH_INCLUDE_DIR AND EXISTS ${PREPROCMATH_INCLUDE_DIR}) list(APPEND _search_paths ${PREPROCMATH_INCLUDE_DIR}) endif() - if(EXISTS PREPROCMATH_PREFIX) - list(APPEND _search_paths ${PREPROCMATH_PREFIX}/include) + if(PREPROCMATH_PREFIX AND EXISTS ${PREPROCMATH_PREFIX}) + list(APPEND _search_paths "${PREPROCMATH_PREFIX}/include") endif() find_path( PREPROCMATH_INCLUDE_DIRS @@ -16,11 +16,11 @@ if(NOT PREPROCMATH_IS_EXTERNAL_PROJECT) PATHS ${_search_paths}) set(_search_paths "") - if(EXISTS PREPROCMATH_LIBRARY_DIR) + if(PREPROCMATH_LIBRARY_DIR AND EXISTS ${PREPROCMATH_LIBRARY_DIR}) list(APPEND _search_paths ${PREPROCMATH_LIBRARY_DIR}) endif() - if(EXISTS PREPROCMATH_PREFIX) - list(APPEND _search_paths ${PREPROCMATH_PREFIX}/lib) + if(PREPROCMATH_PREFIX AND EXISTS ${PREPROCMATH_PREFIX}) + list(APPEND _search_paths "${PREPROCMATH_PREFIX}/lib") endif() find_library( PREPROCMATH_LIBRARIES