Improved the way GaudiProjectConfig.cmake is found.

From: Marco Clemencic <marco.clemencic@cern.ch>


git-svn-id: svn+ssh://svn.cern.ch/reps/gaudi/Gaudi/trunk@7012 53ecefc3-a64d-0410-9bdf-b8581fa3287e

CMakeLists.txt

@@ -2,6 +2,11 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.5)
 
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_SOURCE_DIR}/cmake/modules  ${CMAKE_MODULE_PATH})
 
+# Ensure that we can find GaudiprojectConfig.cmake
+if(NOT GaudiProject_DIR AND ("$ENV{GaudiProject_DIR}" STREQUAL ""))
+  set(GaudiProject_DIR ${CMAKE_SOURCE_DIR}/cmake)
+endif()
+
 #---------------------------------------------------------------
 # Load macros and functions for Gaudi-based projects
 find_package(GaudiProject)

configure

@@ -28,8 +28,7 @@ if [ ! -e build-dir/CMakeCache.txt ] ; then
     mkdir -p build-dir
     cd build-dir
 
-    export CMAKE_PREFIX_PATH=../cmake
-    time cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain/heptools-${LCG_version}.cmake -DBUILD_TESTS=ON $distcc_opt $ccache_opt $lcg_system_opt .. || (cd $rootdir ; rm -rf build-dir)
+    time cmake -DCMAKE_TOOLCHAIN_FILE=$rootdir/cmake/toolchain/heptools-${LCG_version}.cmake -DBUILD_TESTS=ON $distcc_opt $ccache_opt $lcg_system_opt .. || (cd $rootdir ; rm -rf build-dir)
     cd $rootdir
 fi