[ismrmrd] 22/281: Made some build script changes to make build more robust on all platforms

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to annotated tag ismrmrd0.5
in repository ismrmrd.

commit 98bf0c2f83e7082504b75f901258837646e9f3a5
Author: Michael Hansen <michael.hansen at nih.gov>
Date:   Fri Aug 31 10:54:35 2012 -0400

    Made some build script changes to make build more robust on all platforms
---
 CMakeLists.txt      | 1 +
 cmake/FindXSD.cmake | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3b976c0..f5aefce 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,6 +6,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 
 find_package(XSD REQUIRED)
 find_package(XercesC REQUIRED)
+set(Boost_NO_BOOST_CMAKE ON)
 find_package(Boost COMPONENTS thread system REQUIRED)
 find_package(HDF5 1.8 COMPONENTS C CXX HL REQUIRED)
 
diff --git a/cmake/FindXSD.cmake b/cmake/FindXSD.cmake
index 1b1bf0c..dc51682 100644
--- a/cmake/FindXSD.cmake
+++ b/cmake/FindXSD.cmake
@@ -17,11 +17,9 @@ if(XSD_INCLUDE_DIR)
 	#in cache already
 	SET(XSD_FOUND TRUE)
 else(XSD_INCLUDE_DIR)
-	find_file(XSD_EXECUTABLE NAMES ${__XSD_NAME}
+	find_program(XSD_EXECUTABLE NAMES ${__XSD_NAME}
 	     PATHS
 		 ${XSD_DIR}/bin
-		/usr/bin
-		/usr/local/bin
 	)
 
 	if(XSD_EXECUTABLE)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ismrmrd.git