From b1027e031057d6665c23db246c1729ff8d3fa246 Mon Sep 17 00:00:00 2001
From: Matthieu Gallien <matthieu_gallien@yahoo.fr>
Date: Mon, 25 Mar 2013 23:24:24 +0100
Subject: [PATCH] takes into account CMAKE_FIND_ROOT_PATH when checking
 imported targets or config files

When generating export target, takes into account the variable CMAKE_FIND_ROOT_PATH when verifying the existence of files
Takes into account the CMAKE_FIND_ROOT_PATH variable when generating the set_and_check macro in FooConfig.cmake file
---
 Modules/CMakePackageConfigHelpers.cmake |   10 +++++++++-
 Source/cmExportFileGenerator.cxx        |   10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/Modules/CMakePackageConfigHelpers.cmake b/Modules/CMakePackageConfigHelpers.cmake
index 393d05c..bd174eb 100644
--- a/Modules/CMakePackageConfigHelpers.cmake
+++ b/Modules/CMakePackageConfigHelpers.cmake
@@ -221,7 +221,15 @@ get_filename_component(PACKAGE_PREFIX_DIR \"\${CMAKE_CURRENT_LIST_DIR}/${PACKAGE
 macro(set_and_check _var _file)
   set(\${_var} \"\${_file}\")
   if(NOT EXISTS \"\${_file}\")
-    message(FATAL_ERROR \"File or directory \${_file} referenced by variable \${_var} does not exist !\")
+    set(file_found_\${_file} \"\${_file}\")
+    foreach(root_path \${CMAKE_FIND_ROOT_PATH})
+      if(EXISTS \"\${root_path}\${_file}\")
+        set(file_found_\${_file} \"\${root_path}\${_file}\")
+      endif()
+    endforeach()
+    if(NOT EXISTS \"\${_file}\")
+      message(FATAL_ERROR \"File or directory \${_file} referenced by variable \${_var} does not exist !\")
+    endif()
   endif()
 endmacro()
 ")
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 7fd0380..4a49baf 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -815,7 +815,14 @@ cmExportFileGenerator::GenerateImportedFileCheckLoop(std::ostream& os)
         "foreach(target ${_IMPORT_CHECK_TARGETS} )\n"
         "  foreach(file ${_IMPORT_CHECK_FILES_FOR_${target}} )\n"
         "    if(NOT EXISTS \"${file}\" )\n"
-        "      message(FATAL_ERROR \"The imported target \\\"${target}\\\""
+        "      set(found_file_${file} \"${file}\")\n"
+        "      foreach(path_prefix ${CMAKE_FIND_ROOT_PATH})\n"
+        "        if (EXISTS \"${path_prefix}${file}\")\n"
+        "          set(found_file_${file} \"${path_prefix}${file}\")\n"
+        "        endif()\n"
+        "      endforeach()\n"
+        "      if (NOT EXISTS \"${found_file_${file}}\")\n"
+        "        message(FATAL_ERROR \"The imported target \\\"${target}\\\""
         " references the file\n"
         "   \\\"${file}\\\"\n"
         "but this file does not exist.  Possible reasons include:\n"
@@ -825,6 +832,7 @@ cmExportFileGenerator::GenerateImportedFileCheckLoop(std::ostream& os)
         "   \\\"${CMAKE_CURRENT_LIST_FILE}\\\"\n"
         "but not all the files it references.\n"
         "\")\n"
+        "      endif()\n"
         "    endif()\n"
         "  endforeach()\n"
         "  unset(_IMPORT_CHECK_FILES_FOR_${target})\n"
-- 
1.7.10.4

cmake_minimum_required(VERSION 2.8.10)

project(project1 CXX C)

# create a Config.cmake and a ConfigVersion.cmake file and install them
set(CMAKECONFIG_INSTALL_PREFIX "lib/cmake")
set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/project1")
set(INCLUDE_INSTALL_DIR "inc")

include(CMakePackageConfigHelpers)

configure_package_config_file(
  "${CMAKE_CURRENT_SOURCE_DIR}/project1Config.cmake.in"
  "${CMAKE_CURRENT_BINARY_DIR}/project1Config.cmake"
  INSTALL_DESTINATION  ${CMAKECONFIG_INSTALL_DIR}
  PATH_VARS  INCLUDE_INSTALL_DIR CMAKE_INSTALL_PREFIX
)

install(FILES
  "${CMAKE_CURRENT_BINARY_DIR}/project1Config.cmake"
  DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
  COMPONENT Devel
)

install(EXPORT project1Targets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE project1Targets.cmake NAMESPACE TEST:: )

project(project1)

include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../
                    ${CMAKE_CURRENT_BINARY_DIR}/../)

add_library(project1 SHARED project1.cpp)

set_target_properties(project1 PROPERTIES VERSION "0.0.1"
                                         SOVERSION "0.0")
 
install(TARGETS project1 EXPORT project1Targets RUNTIME DESTINATION bin LIBRARY DESTINATION lib/i386-linux-gnu ARCHIVE DESTINATION lib/i386-linux-gnu COMPONENT Devel)

install(FILES project1.h
        DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel )

cmake_minimum_required(VERSION 2.8.10)

project(project2 CXX C)

find_package(project1)

add_executable(project2 project2.cpp)

target_link_libraries(project2 project1)