[ismrmrd] 133/177: utilities: check for both FFTW3 and Boost PO

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


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

ghisvail-guest pushed a commit to annotated tag v1.1.0.beta.1
in repository ismrmrd.

commit 4af605534a31c3379f725583ec64f27b24f6d5d8
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Tue Oct 7 16:14:57 2014 +0100

    utilities: check for both FFTW3 and Boost PO
---
 utilities/CMakeLists.txt | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/utilities/CMakeLists.txt b/utilities/CMakeLists.txt
index e1b20ff..0363ee4 100644
--- a/utilities/CMakeLists.txt
+++ b/utilities/CMakeLists.txt
@@ -1,12 +1,13 @@
 find_package(Boost COMPONENTS program_options)
 find_package(FFTW3 COMPONENTS single)
 
-if(WIN32)
-    link_directories(${Boost_LIBRARY_DIRS})
-endif(WIN32)
+if(FFTW3_FOUND AND Boost_FOUND)
+    message("FFTW3 and Boost Found, building utilities")
+    
+    if(WIN32)
+        link_directories(${Boost_LIBRARY_DIRS})
+    endif(WIN32)
 
-if(FFTW3_FOUND)
-    message("FFTW3 Found, building utilities")
     include_directories(
         ${CMAKE_SOURCE_DIR/include}
         ${Boost_INCLUDE_DIR}
@@ -45,6 +46,6 @@ if(FFTW3_FOUND)
     install(TARGETS ismrmrd_recon_cartesian_2d
 			DESTINATION bin)
 
-else(FFTW3_FOUND)
-	message("FFTW3 NOT Found, cannot build utilities")
-endif(FFTW3_FOUND)
+else(FFTW3_FOUND AND Boost_FOUND)
+	message("FFTW3 or Boost NOT Found, cannot build utilities")
+endif(FFTW3_FOUND AND Boost_FOUND)

-- 
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