[ismrmrd] 43/281: Fixed bug introduced in FindXSD.cmake on Linux/Mac

Ghislain Vaillant ghisvail-guest at moszumanska.debian.org
Wed Jan 14 20:00:54 UTC 2015


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 03d0770afc5cf19f1e405be78fbea286584e1ddd
Author: Michael S. Hansen <michael.hansen at nih.gov>
Date:   Tue Sep 11 10:48:10 2012 -0400

    Fixed bug introduced in FindXSD.cmake on Linux/Mac
---
 cmake/FindXSD.cmake | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/cmake/FindXSD.cmake b/cmake/FindXSD.cmake
index 4590e8c..ed83d61 100644
--- a/cmake/FindXSD.cmake
+++ b/cmake/FindXSD.cmake
@@ -17,11 +17,21 @@ if(XSD_INCLUDE_DIR)
 	#in cache already
 	SET(XSD_FOUND TRUE)
 else(XSD_INCLUDE_DIR)
+	IF (WIN32) 
 	find_program(XSD_EXECUTABLE NAMES "bin/${__XSD_NAME}" "${__XSD_NAME}"
 	     PATHS
 		 ${XSD_DIR}
 		 ${XSD_DIR}/bin
 	)
+	ELSE(WIN32)
+	find_file(XSD_EXECUTABLE NAMES ${__XSD_NAME}
+	     PATHS
+	         /usr/local/bin
+		 /usr/bin
+		 ${XSD_DIR}
+		 ${XSD_DIR}/bin
+	)
+	ENDIF(WIN32)
 
 	if(XSD_EXECUTABLE)
 		SET(XSD_FOUND TRUE)

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



More information about the debian-science-commits mailing list