Merge pull request BRAINSia#185 from Chaircrusher/Build_Fixes

ENH: Push DoubleToString class to BRAINSCommonLib
matsuij · Feb 5, 2013 · bd56bd5 · bd56bd5
2 parents e9c2f06 + 7eefbd9
commit bd56bd5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/DWIConvert/DoubleToString.h → BRAINSCommonLib/DoubleToString.h b/DWIConvert/DoubleToString.h → BRAINSCommonLib/DoubleToString.h
diff --git a/BRAINSTools.cmake b/BRAINSTools.cmake
@@ -25,6 +25,12 @@ include(${GenerateCLP_USE_FILE})
 include(${SlicerExecutionModel_USE_FILE})
 include(${SlicerExecutionModel_CMAKE_DIR}/SEMMacroBuildCLI.cmake)
 
+#-----------------------------------------------------------------------------
+# use double-conversion library for consistent printing of double & float
+#-----------------------------------------------------------------------------
+find_package(double-conversion REQUIRED)
+include_directories(${double-conversion_INCLUDE_DIRS})
+
 if(USE_ANTS)
   # find ANTS includes
   message( STATUS "XXXXXXXXXXXXX ${BOOST_INCLUDE_DIR} XXXXXXX")

diff --git a/DWIConvert/CMakeLists.txt b/DWIConvert/CMakeLists.txt
@@ -5,9 +5,6 @@ enable_testing()
 
 find_package(ITK 4 REQUIRED)
 
-find_package(double-conversion REQUIRED)
-include_directories(${double-conversion_INCLUDE_DIRS})
-
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR} ${CMAKE_MODULE_PATH})
 
 set(DWIConvertSupportLib_SRCS

diff --git a/SuperBuild/VTKPatch.cmake b/SuperBuild/VTKPatch.cmake
@@ -26,8 +26,9 @@ file(WRITE ${ftglCMakeLists_txt} "${code}")
 
 #set(vtkVRMLImporter
 #  ${VTKSource}/IO/Import/vtkVRMLImporter.cxx)
-file(GLOB_RECURSE vtkVRMLImporter RELATIVE ${VTKSource} "vtkVRMLImporter.cxx")
-set(vtkVRMLImporter "${VTKSource}/${vtkVRMLImporter}")
+find_file(vtkVRMLImporter vtkVRMLImporter.cxx
+  HINTS ${VTKSource}/Hybrid ${VTKSource}/IO/IMPORT
+)
 message("vtkVRMLImporter=${vtkVRMLImporter}")
 
 file(READ ${vtkVRMLImporter}