Merge branch 'master' into moduleColorHack

Author: dcwhite

src/CMakeLists.txt

@@ -100,7 +100,7 @@ MESSAGE(STATUS "Git version commit hash: " "${VERSION_HASHVAR}")
 #string(REGEX REPLACE "^v[0-9]+\\.[0-9]+\\.[0-9]+(.*)" "\\1" VERSION_SHA1 "${VERSION}")
 #set(VERSION_SHORT "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/Version.cc.in
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CMake/Modules/Version.cc.in
  ${CMAKE_CURRENT_SOURCE_DIR}/Core/Application/Version.cc)
 set(version_file "${CMAKE_CURRENT_SOURCE_DIR}/Core/Application/Version.cc")
 

src/Core/Algorithms/Visualization/DataConversions.h

@@ -29,7 +29,6 @@
 #ifndef CORE_ALGORITHMS_VISUALIZATION_DATA_CONVERSIONS_H
 #define CORE_ALGORITHMS_VISUALIZATION_DATA_CONVERSIONS_H
 
-#include <Core/Algorithms/Visualization/share.h>
 #include <Core/Datatypes/Color.h>
 #include <Core/GeometryPrimitives/Vector.h>
 #include <Core/GeometryPrimitives/Tensor.h>
@@ -39,6 +38,8 @@
 #include <iomanip>
 #include <iostream>
 
+#include <Core/Algorithms/Visualization/share.h>
+
 namespace SCIRun {
 
 // Conversion templates.