Text archives Help

---

Author: bigler
Date: Wed Jun  7 12:25:08 2006
New Revision: 1101

Modified:
   trunk/Core/Math/SSEDefs.h
   trunk/Model/Groups/CMakeLists.txt
   trunk/StandAlone/CMakeLists.txt
Log:

Core/Math/SSEDefs.h

  Added newline to quiet compiler chatter.  If you see compiler
  chatter that is easily fixed, please do so before commiting.

  Since this file makes use of MANTA_SSE, include the appropiate
  header file with that definition in it.

Model/Groups/CMakeLists.txt

  Since TimeSteppedParticles depends on ParticleNRRD, only compile it
  if BUILD_NRRDPARTICLES is set.

StandAlone/CMakeLists.txt

  Added thread libraries to octvol_build, so it will link properly.
  This should probably be added SCIRun_Core as a dependency, since
  that depends on the thread stuff.



Modified: trunk/Core/Math/SSEDefs.h
==============================================================================
--- trunk/Core/Math/SSEDefs.h   (original)
+++ trunk/Core/Math/SSEDefs.h   Wed Jun  7 12:25:08 2006
@@ -4,6 +4,8 @@
 #ifndef _MANTA_SSEDEFS_H_
 #define _MANTA_SSEDEFS_H_
 
+#include <MantaSSE.h>
+
 #ifdef MANTA_SSE
 #include <xmmintrin.h>
 #include <Core/Util/Align.h>
@@ -248,4 +250,4 @@
 };
 
 #endif  //#ifdef MANTA_SSE
-#endif
\ No newline at end of file
+#endif

Modified: trunk/Model/Groups/CMakeLists.txt
==============================================================================
--- trunk/Model/Groups/CMakeLists.txt   (original)
+++ trunk/Model/Groups/CMakeLists.txt   Wed Jun  7 12:25:08 2006
@@ -28,8 +28,6 @@
      Groups/PsiGammaTable.h
      Groups/RealisticBvh.cc
      Groups/RealisticBvh.h
-     Groups/TimeSteppedParticles.cc
-     Groups/TimeSteppedParticles.h
      Groups/TransparentKDTree.cc
      Groups/TransparentKDTree.h
      Groups/VolumeGrid.h
@@ -55,3 +53,12 @@
     Groups/VerticalKDTree-stub.cc
     )
 ENDIF(MANTA_SSE)
+
+IF(BUILD_NRRDPARTICLES)
+  SET(Manta_Groups_SRCS
+    ${Manta_Groups_SRCS}
+    Groups/TimeSteppedParticles.cc
+    Groups/TimeSteppedParticles.h
+   )
+   INCLUDE_DIRECTORIES(${FOUND_TEEM_INCLUDE})
+ENDIF(BUILD_NRRDPARTICLES)

Modified: trunk/StandAlone/CMakeLists.txt
==============================================================================
--- trunk/StandAlone/CMakeLists.txt     (original)
+++ trunk/StandAlone/CMakeLists.txt     Wed Jun  7 12:25:08 2006
@@ -13,7 +13,8 @@
                                   ${CMAKE_THREAD_LIBS_INIT})
 
 ADD_EXECUTABLE(octvol_build octvol_build.cc)
-TARGET_LINK_LIBRARIES(octvol_build SCIRun_Core Manta_Model -lm)
+TARGET_LINK_LIBRARIES(octvol_build SCIRun_Core Manta_Model
+                                   ${CMAKE_THREAD_LIBS_INIT} -lm)
 
 #ADD_EXECUTABLE(frust-test frust-test.cc)
 #TARGET_LINK_LIBRARIES(frust-test ${MANTA_TARGET_LINK_LIBRARIES}
@@ -24,8 +25,8 @@
 IF (BUILD_V3C1_TOOLS) 
    ADD_EXECUTABLE(v3c1_tools v3c1_tools.cc)
    TARGET_LINK_LIBRARIES(v3c1_tools SCIRun_Core Manta_Core Manta_Model)
-   TARGET_LINK_LIBRARIES(v3c1_tools ${CMAKE_THREAD_LIBS_INIT}                
                   
-                                    ${OPENGL_LIBRARIES}                      
                    
-                                    ${X11_LIBRARIES}                         
                    
+   TARGET_LINK_LIBRARIES(v3c1_tools ${CMAKE_THREAD_LIBS_INIT}
+                                    ${OPENGL_LIBRARIES}
+                                    ${X11_LIBRARIES}
                                     -lm)  
 ENDIF(BUILD_V3C1_TOOLS)

---

• [MANTA] r1101 - in trunk: Core/Math Model/Groups StandAlone, bigler, 06/07/2006

---

Archive powered by MHonArc 2.6.16.