Enable Converter library

Author: dcwhite

src/Core/Algorithms/Legacy/CMakeLists.txt

@@ -1,22 +1,22 @@
 #
 #  For more information, please see: http://software.sci.utah.edu
-# 
+#
 #  The MIT License
-# 
+#
 #  Copyright (c) 2012 Scientific Computing and Imaging Institute,
 #  University of Utah.
-# 
-#  
+#
+#
 #  Permission is hereby granted, free of charge, to any person obtaining a
 #  copy of this software and associated documentation files (the "Software"),
 #  to deal in the Software without restriction, including without limitation
 #  the rights to use, copy, modify, merge, publish, distribute, sublicense,
 #  and/or sell copies of the Software, and to permit persons to whom the
 #  Software is furnished to do so, subject to the following conditions:
-# 
+#
 #  The above copyright notice and this permission notice shall be included
-#  in all copies or substantial portions of the Software. 
-# 
+#  in all copies or substantial portions of the Software.
+#
 #  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 #  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 #  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@@ -28,5 +28,6 @@
 
 ADD_SUBDIRECTORY(Fields)
 ADD_SUBDIRECTORY(DataIO)
+ADD_SUBDIRECTORY(Converter)
 #ADD_SUBDIRECTORY(Math)
 ADD_SUBDIRECTORY(FiniteElements)

src/Core/Algorithms/Legacy/Converter/CMakeLists.txt

@@ -1,22 +1,22 @@
 #
 #  For more information, please see: http://software.sci.utah.edu
-# 
+#
 #  The MIT License
-# 
+#
 #  Copyright (c) 2009 Scientific Computing and Imaging Institute,
 #  University of Utah.
-# 
-#  
+#
+#
 #  Permission is hereby granted, free of charge, to any person obtaining a
 #  copy of this software and associated documentation files (the "Software"),
 #  to deal in the Software without restriction, including without limitation
 #  the rights to use, copy, modify, merge, publish, distribute, sublicense,
 #  and/or sell copies of the Software, and to permit persons to whom the
 #  Software is furnished to do so, subject to the following conditions:
-# 
+#
 #  The above copyright notice and this permission notice shall be included
 #  in all copies or substantial portions of the Software.
-# 
+#
 #  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 #  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 #  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@@ -28,33 +28,38 @@
 
 # Sources of Core/Algorithms/Converter classes
 
-SET(Core_Algorithms_Converter_SRCS
+SET(Core_Algorithms_Legacy_Converter_SRCS
   ConverterAlgo.cc
-  MatrixToField.cc
-  NrrdToField.cc
-  FieldToNrrd.cc
-  ConvertToNrrd.cc
-  MatricesToDipoleField.cc
-  ConvertBundleToField.cc
+  #MatrixToField.cc
+  #NrrdToField.cc
+  #FieldToNrrd.cc
+  #ConvertToNrrd.cc
+  #MatricesToDipoleField.cc
+  #ConvertBundleToField.cc
+)
+
+SET(Core_Algorithms_Legacy_Converter_HEADERS
+  ConverterAlgo.h
 )
 
-SCIRUN_ADD_LIBRARY(Core_Algorithms_Converter ${Core_Algorithms_Converter_SRCS})
+ADD_LIBRARY(Core_Algorithms_Legacy_Converter
+  ${Core_Algorithms_Legacy_Converter_SRCS}
+  ${Core_Algorithms_Legacy_Converter_HEADERS})
 
-TARGET_LINK_LIBRARIES(Core_Algorithms_Converter 
-  Core_Algorithms_Util
-  Core_Datatypes 
-  Core_Util 
-  Core_Exceptions 
-  Core_Thread 
-  Core_Geom 
-  Core_Geometry 
-  Core_Persistent 
-  Core_Basis 
-  ${M_LIBRARY} 
-  ${SCI_TEEM_LIBRARY}
+TARGET_LINK_LIBRARIES(Core_Algorithms_Legacy_Converter
+  Algorithms_Base
+  Core_Datatypes
+  #Core_Util
+  #Core_Exceptions
+  #Core_Thread
+  #Core_Geom
+  #Core_Geometry
+  #Core_Persistent
+  #Core_Basis
+  #${M_LIBRARY}
+  #${SCI_TEEM_LIBRARY}
 )
 
 IF(BUILD_SHARED_LIBS)
-  ADD_DEFINITIONS(-DBUILD_Core_Algorithms_Converter)
+  ADD_DEFINITIONS(-DBUILD_Core_Algorithms_Legacy_Converter)
 ENDIF(BUILD_SHARED_LIBS)
-

src/Core/Algorithms/Legacy/Converter/share.h

@@ -6,7 +6,7 @@
    Copyright (c) 2009 Scientific Computing and Imaging Institute,
    University of Utah.
 
-   
+
    Permission is hereby granted, free of charge, to any person obtaining a
    copy of this software and associated documentation files (the "Software"),
    to deal in the Software without restriction, including without limitation
@@ -29,7 +29,7 @@
 #undef SCISHARE
 
 #if defined(_WIN32) && !defined(BUILD_SCIRUN_STATIC)
-#ifdef BUILD_Core_Algorithms_Converter
+#ifdef BUILD_Core_Algorithms_Legacy_Converter
 #define SCISHARE __declspec(dllexport)
 #else
 #define SCISHARE __declspec(dllimport)