Merge pull request #1 from Chaircrusher/CorrectBuildErrors

COMP: Fixed broken stuff such that project actually compiles
BRAINSia · Feb 28, 2013 · 27d7fa1 · 27d7fa1
2 parents 17d0f2e + b682ea9
commit 27d7fa1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git a/SuperBuild.cmake b/SuperBuild.cmake
@@ -105,10 +105,10 @@ set(ITK_EXTERNAL_NAME ITKv${ITK_VERSION_MAJOR})
 
 
 ## for i in SuperBuild/*; do  echo $i |sed 's/.*External_\([a-zA-Z]*\).*/\1/g'|fgrep -v cmake|fgrep -v Template; done|sort -u
-set(${PRIMARY_PROJECT_NAME}_DEPENDENCIES 
+set(${PRIMARY_PROJECT_NAME}_DEPENDENCIES
   SlicerExecutionModel
-  ${ITK_EXTERNAL_NAME} 
-  DCMTK 
+  ${ITK_EXTERNAL_NAME}
+  DCMTK
   VTK
   OpenCV
   OpenJPEG

diff --git a/SuperBuild/External_Uncrustify.cmake b/SuperBuild/External_Uncrustify.cmake
@@ -53,19 +53,19 @@ if(NOT ( DEFINED "${extProjName}_EXE" OR ( DEFINED "${USE_SYSTEM_${extProjName}}
   )
 
   ### --- End Project specific additions
-  set(${proj}_REPOSITORY ${git_protocol}://uncrustify.git.sourceforge.net/gitroot/uncrustify/uncrustify)
-  set(${proj}_GIT_TAG 60f3681da60462eda539b78e0c6c3eea823481e5)
+  set(${proj}_REPOSITORY "${git_protocol}://github.com/bengardner/uncrustify.git")
+  set(${proj}_GIT_TAG "84dde5e2f8722dcfb511a1d264b0834b95f6f294")
   ExternalProject_Add(${proj}
     GIT_REPOSITORY ${${proj}_REPOSITORY}
     GIT_TAG ${${proj}_GIT_TAG}
-    SOURCE_EXE ${proj}
-    BINARY_EXE ${proj}-build
+    SOURCE_DIR ${proj}
+    BINARY_DIR ${proj}-build
     ${cmakeversion_external_update} "${cmakeversion_external_update_value}"
-    CONFIGURE_COMMAND <SOURCE_EXE>/configure --prefix=${CMAKE_BINARY_EXE}/Utils
+    CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${CMAKE_BINARY_DIR}/Utils
     DEPENDS
       ${${proj}_DEPENDENCIES}
   )
-  set(${extProjName}_EXE ${CMAKE_BINARY_EXE}/Utils/bin/uncrustify)
+  set(${extProjName}_EXE ${CMAKE_BINARY_DIR}/Utils/bin/uncrustify)
 else()
   if(${USE_SYSTEM_${extProjName}})
     find_package(${extProjName} ${${extProjName}_REQUIRED_VERSION} REQUIRED)

diff --git a/SuperBuild/External_VTK_patch.cmake b/SuperBuild/External_VTK_patch.cmake
@@ -24,11 +24,9 @@ string(REPLACE " -fpascal-strings" "" code "${code}")
 
 file(WRITE ${ftglCMakeLists_txt} "${code}")
 
-#set(vtkVRMLImporter
-#  ${VTKSource}/IO/Import/vtkVRMLImporter.cxx)
-file(GLOB_RECURSE vtkVRMLImporter RELATIVE ${VTKSource} "vtkVRMLImporter.cxx")
-set(vtkVRMLImporter "${VTKSource}/${vtkVRMLImporter}")
-message("vtkVRMLImporter=${vtkVRMLImporter}")
+find_file(vtkVRMLImporter vtkVRMLImporter.cxx
+  HINTS ${VTKSource}/Hybrid ${VTKSource}/IO/IMPORT
+)
 
 file(READ ${vtkVRMLImporter}
   code)