Merge branch 'RTK-ExternalModule' of github.com:SimonRit/RTK into RTK…

…-ExternalModule
RTKConsortium · Apr 13, 2018 · abcaddc · abcaddc
2 parents 6032afd + f878f20
commit abcaddc
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -19,6 +19,13 @@ foreach(p ${CMAKE_POLICIES})
   endif()
 endforeach()
 
+#=========================================================
+# Help function to debug CMake
+macro (DD in)
+  message(${in}=[${${in}}])
+endmacro()
+#=========================================================
+
 project(RTK)
 
 ## RTK Version

diff --git a/include/rtkGeneralPurposeFunctions.h b/include/rtkGeneralPurposeFunctions.h
@@ -59,6 +59,7 @@ GetSortingPermutation(std::vector<TVectorElement> input)
   return result;
 }
 
+inline
 static std::vector<double>
 ReadSignalFile(std::string filename)
 {

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -51,6 +51,18 @@ set(RTK_SRCS
   srtkThreeDCircularProjectionGeometryXMLFileWriter.cxx
   )
 
+#=========================================================
+# This is a fix for when using Module_ITKVtkGlue
+# (https://gitlab.kitware.com/vtk/vtk/issues/15895)
+get_directory_property(defCom COMPILE_DEFINITIONS)
+set(defComSansVTK)
+foreach(def ${defCom})
+  if(NOT def MATCHES "^vtk.*")
+    list(APPEND defComSansVTK ${def})
+  endif()
+endforeach()
+set_directory_properties(PROPERTIES COMPILE_DEFINITIONS "${defComSansVTK}")
+
 #=========================================================
 # CUDA library
 #=========================================================

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -258,7 +258,7 @@ rtk_add_cuda_test(rtkFourDRoosterCudaTest rtkfourdroostertest.cxx)
 rtk_add_cuda_test(rtkADMMWaveletsCudaTest rtkadmmwaveletstest.cxx)
 rtk_add_cuda_test(rtkADMMTotalVariationCudaTest rtkadmmtotalvariationtest.cxx 
   DATA{Input/Phases/phases.txt}
-  Data{Input/Phases/phases_3projs.txt})
+  DATA{Input/Phases/phases_3projs.txt})
 rtk_add_cuda_test(rtkRegularizedConjugateGradientCudaTest rtkregularizedconjugategradienttest.cxx)
 rtk_add_cuda_test(rtkCudaRaycastAdjointOperatorsCudaTest rtkcudaraycastadjointoperatorstest.cxx)
 rtk_add_cuda_test(rtkCyclicDeformationCudaTest rtkcyclicdeformationtest.cxx)

diff --git a/utilities/lp_solve/lp_lib.h b/utilities/lp_solve/lp_lib.h
@@ -377,6 +377,9 @@
 #define LE                       ROWTYPE_LE
 #define GE                       ROWTYPE_GE
 #define EQ                       ROWTYPE_EQ
+#ifdef OF
+# undef OF
+#endif
 #define OF                       ROWTYPE_OF
 
 /* MIP constraint classes */
-Original file line number
+Diff line change
@@ Expand Up / @@ -59,6 +59,7 @@ GetSortingPermutation(std::vector<TVectorElement> input) @@
       return result;
     }
+    inline
     static std::vector<double>
     ReadSignalFile(std::string filename)
     {
@@ Expand Down @@