Merge branch 'experimental' into topic-freesurfer

Author: shakes76

CMake/version.cmake

@@ -4,5 +4,5 @@
 # ITK version number.  An even minor number corresponds to releases.
 SET(SMILX_VERSION_MAJOR "1")
 SET(SMILX_VERSION_MINOR "0")
-SET(SMILX_VERSION_PATCH "2")
+SET(SMILX_VERSION_PATCH "4")
 SET(SMILX_VERSION_STRING "${SMILX_VERSION_MAJOR}.${SMILX_VERSION_MINOR}.${SMILX_VERSION_PATCH}")

apps/CMakeLists.txt

@@ -21,6 +21,7 @@ IF(BUILD_MILXQT)
   add_subdirectory (milxImageViewer)
   add_subdirectory (milxModelViewer)
   add_subdirectory (milxOverlay)
+  add_subdirectory (milxBlend)
   if(BUILD_ANIMATE_PLUGIN)
       add_subdirectory(milxAnimate)
   endif(BUILD_ANIMATE_PLUGIN)

apps/milxBlend/CMakeLists.txt

@@ -0,0 +1,87 @@
+cmake_minimum_required(VERSION 2.8)
+
+# Include the directory itself as a path to include directories
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+PROJECT(milxBlend)
+
+FIND_PACKAGE(VTK REQUIRED)
+INCLUDE(${VTK_USE_FILE})
+
+FIND_PACKAGE(ITK REQUIRED)
+INCLUDE(${ITK_USE_FILE})
+
+#--------------------------------------------------------------------------------
+# This sets the windows build that will need the special winmain@16 call. Qt provides
+#  this for us in the qtmain.lib file. Using this cmake code will ensure we have it
+#  linked into our build. Not needed on Unix/OS X/Linux which is why we have the 
+#  IF(WIN32) conditional.
+IF (WIN32)
+    SET (QT_USE_QTMAIN TRUE)
+ENDIF (WIN32)
+
+#--------------------------------------------------------------------------------
+# this command finds Qt4 libraries and sets all required variables
+# note that it's Qt4, not QT4 or qt4
+#detect Qt version (depends on VTK-Qt)
+#VTK_QT_VERSION is declared in VTKConfig.cmake in VTK 6.1, vtkQt.cmake only available in out-of-source builds and not installed
+IF(VTK_QT_VERSION VERSION_GREATER "4")
+  FIND_PACKAGE(Qt5Widgets REQUIRED QUIET)
+  include_directories(${Qt5Widgets_INCLUDE_DIRS})
+  add_definitions(${Qt5Widgets_DEFINITIONS})
+  qt5_wrap_cpp(QVTKLibMocSrcs ${QVTKMocHeaders})
+  set(QT_LIBRARIES ${Qt5Widgets_LIBRARIES})
+ELSE(VTK_QT_VERSION VERSION_GREATER "4")
+  FIND_PACKAGE(Qt4 REQUIRED QtCore QtGui QtWebkit)
+  INCLUDE(${QT_USE_FILE})
+ENDIF(VTK_QT_VERSION VERSION_GREATER "4")
+
+set(MILXQT_DIR ${SMILI_SOURCE_DIR})
+ADD_DEFINITIONS(-DMILX_DLL) #DLL Export MILX
+ADD_DEFINITIONS(-DMILX_PLUGIN_DLL) #DLL Export MILX
+IF(WIN32)
+	SET(MILXQT_INSTALL_BINARY_DIR "C:/Program Files/MILX/lib")
+ELSE(WIN32)
+	SET(MILXQT_INSTALL_BINARY_DIR /usr/local/lib)
+ENDIF(WIN32)
+
+#MILX-MSK Options
+IF(WIN32)
+	set(MILX-MSK_DIR $ENV{PROGRAMFILES}/MILX_MSK)
+#~     message("${MILX-MSK_DIR}")
+ENDIF(WIN32)
+IF(UNIX)
+	set(MILX-MSK_DIR /usr/local)
+ENDIF(UNIX)
+
+# Add Headers into List
+file(GLOB MILXQT_HEADERS ${MILXQT_DIR}/include/*.h)
+file(GLOB MILXQT_LIBS ${SMILI_BINARY_DIR}/lib/*${CMAKE_SHARED_LIBRARY_SUFFIX}*)
+file(GLOB MILXQT_PLUGINS ${SMILI_BINARY_DIR}/plugins/*${CMAKE_SHARED_LIBRARY_SUFFIX}*)
+file(GLOB PYTHONQT_LIBS ${PYTHONQT_DIR}/lib/*PythonQt*${CMAKE_SHARED_LIBRARY_SUFFIX}*)
+file(GLOB VTK_QT_LIBS ${VTK_LIBRARY_DIRS}/*Q*${CMAKE_SHARED_LIBRARY_SUFFIX}*)
+file(GLOB MSK_LIBS ${MILX-MSK_DIR}/lib/*${CMAKE_SHARED_LIBRARY_SUFFIX}*)
+
+include_directories (${MILXQT_INCLUDE_DIRS})
+link_directories(${MILXQT_INSTALL_BINARY_DIR})
+
+ADD_EXECUTABLE(milxBlend MACOSX_BUNDLE milxBlend.cpp)
+TARGET_LINK_LIBRARIES(milxBlend milx-Qt milx-SMILI ${QT_LIBRARIES} ${VTK_LIBRARIES} ${ITK_LIBRARIES})
+
+IF(UNIX)
+  configure_file(milxBlend.in "milxBlend" @ONLY)
+  
+  install(FILES "${PROJECT_BINARY_DIR}/milxBlend" DESTINATION "../../bin" 
+    PERMISSIONS WORLD_READ WORLD_EXECUTE)
+ENDIF(UNIX)
+
+# expand the command line wild-cards in msvc
+IF(MSVC)
+  SET_TARGET_PROPERTIES(milxBlend PROPERTIES LINK_FLAGS "setargv.obj")
+ENDIF(MSVC)
+
+# Installs the executable
+INSTALL(TARGETS milxBlend 
+	BUNDLE DESTINATION . COMPONENT Runtime
+	RUNTIME DESTINATION bin COMPONENT Runtime
+	)