Unverified Commit 7fd81fac authored by Atkins, Charles Vernon's avatar Atkins, Charles Vernon Committed by GitHub
Browse files

Merge pull request #3237 from chuckatkins/fix-cmake-module-path-mangle 

cmake: Fix CMAKE_*_PATH mangling
parents ddee618a 385ac97b

cmake/FindCrayDRC.cmake

+4 −4
Original line number Diff line number Diff line
@@ -13,18 +13,18 @@ 
if(NOT (PC_CrayDRC_FOUND STREQUAL "IGNORE"))

  find_package(PkgConfig)

  if(PKG_CONFIG_FOUND)

    set(_CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH})

    set(_CrayDRC_CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH})

    if(CrayDRC_ROOT)

      list(INSERT CMAKE_PREFIX_PATH 0 "${CrayDRC_ROOT}")

    elseif(NOT ENV{CrayDRC_ROOT} STREQUAL "")

      list(INSERT CMAKE_PREFIX_PATH 0 "$ENV{CrayDRC_ROOT}")

    endif()

    set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH ON)

    set(PKG_CONFIG_USE_CrayDRC_CMAKE_PREFIX_PATH ON)



    pkg_check_modules(PC_CrayDRC cray-drc)



    set(CMAKE_PREFIX_PATH ${_CMAKE_PREFIX_PATH})

    unset(_CMAKE_PREFIX_PATH)

    set(CMAKE_PREFIX_PATH ${_CrayDRC_CMAKE_PREFIX_PATH})

    unset(_CrayDRC_CMAKE_PREFIX_PATH)



    if(PC_CrayDRC_FOUND)

      if(BUILD_SHARED_LIBS)

cmake/FindDataSpaces.cmake

+4 −4
Original line number Diff line number Diff line
@@ -36,16 +36,16 @@ if(NOT DATASPACES_FOUND) 
  endif()

  find_package(PkgConfig)

  if(PKG_CONFIG_FOUND)

    set(_CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH})

    set(_DATASPACES_CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH})

    if(DATASPACES_ROOT)

      list(INSERT CMAKE_PREFIX_PATH 0 "${DATASPACES_ROOT}")

    elseif(NOT ENV{DATASPACES_ROOT} STREQUAL "")

      list(INSERT CMAKE_PREFIX_PATH 0 "$ENV{DATASPACES_ROOT}")

    endif()

    set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH ON)

    set(PKG_CONFIG_USE_DATASPACES_CMAKE_PREFIX_PATH ON)

    pkg_check_modules(PC_DSPACES dspaces)

    set(CMAKE_PREFIX_PATH ${_CMAKE_PREFIX_PATH})

    unset(_CMAKE_PREFIX_PATH)

    set(CMAKE_PREFIX_PATH ${_DATASPACES_CMAKE_PREFIX_PATH})

    unset(_DATASPACES_CMAKE_PREFIX_PATH)

    if(PC_DSPACES_FOUND)

      if(BUILD_SHARED_LIBS)

        set(_PC_TYPE)

cmake/FindLIBFABRIC.cmake

+4 −4
Original line number Diff line number Diff line
@@ -13,18 +13,18 @@ 
if(NOT (PC_LIBFABRIC_FOUND STREQUAL "IGNORE"))

  find_package(PkgConfig)

  if(PKG_CONFIG_FOUND)

    set(_CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH})

    set(_LIBFABRIC_CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH})

    if(LIBFABRIC_ROOT)

      list(INSERT CMAKE_PREFIX_PATH 0 "${LIBFABRIC_ROOT}")

    elseif(NOT ENV{LIBFABRIC_ROOT} STREQUAL "")

      list(INSERT CMAKE_PREFIX_PATH 0 "$ENV{LIBFABRIC_ROOT}")

    endif()

    set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH ON)

    set(PKG_CONFIG_USE_LIBFABRIC_CMAKE_PREFIX_PATH ON)



    pkg_check_modules(PC_LIBFABRIC libfabric)



    set(CMAKE_PREFIX_PATH ${_CMAKE_PREFIX_PATH})

    unset(_CMAKE_PREFIX_PATH)

    set(CMAKE_PREFIX_PATH ${_LIBFABRIC_CMAKE_PREFIX_PATH})

    unset(_LIBFABRIC_CMAKE_PREFIX_PATH)



    if(PC_LIBFABRIC_FOUND)

      if(BUILD_SHARED_LIBS)

cmake/adios2-config-install.cmake.in

+3 −3
Original line number Diff line number Diff line 
cmake_minimum_required(VERSION 3.1)



set(_CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH})

set(_ADIOS2_CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH})

list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_CURRENT_LIST_DIR}")



if(NOT @BUILD_SHARED_LIBS@)
@@ -28,5 +28,5 @@ endif() 
set(${CMAKE_FIND_PACKAGE_NAME}_CONFIG "${CMAKE_CURRENT_LIST_FILE}")

include("${CMAKE_CURRENT_LIST_DIR}/adios2-config-common.cmake")



set(CMAKE_MODULE_PATH ${_CMAKE_MODULE_PATH})

unset(_CMAKE_MODULE_PATH)
 
set(CMAKE_MODULE_PATH ${_ADIOS2_CMAKE_MODULE_PATH})

unset(_ADIOS2_CMAKE_MODULE_PATH)

cmake/adios2-config.cmake.in

+3 −3
Original line number Diff line number Diff line 
set(_CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH})

set(_ADIOS2_CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH})

list(INSERT CMAKE_MODULE_PATH 0 "@ADIOS2_SOURCE_DIR@/cmake")



if(@ADIOS2_HAVE_SST@)
@@ -14,5 +14,5 @@ endif() 
set(${CMAKE_FIND_PACKAGE_NAME}_CONFIG "${CMAKE_CURRENT_LIST_FILE}")

include("${CMAKE_CURRENT_LIST_DIR}/adios2-config-common.cmake")



set(CMAKE_MODULE_PATH ${_CMAKE_MODULE_PATH})

unset(_CMAKE_MODULE_PATH)
 
set(CMAKE_MODULE_PATH ${_ADIOS2_CMAKE_MODULE_PATH})

unset(_ADIOS2_CMAKE_MODULE_PATH)