Manta Interactive Ray Tracer Development Mailing List

Text archives Help


[Manta] r2349 - in trunk: . CMake Engine Image Model Model/Readers UserInterface


Chronological Thread 
  • From:
  • To:
  • Subject: [Manta] r2349 - in trunk: . CMake Engine Image Model Model/Readers UserInterface
  • Date: Wed, 19 Nov 2008 22:41:04 -0700 (MST)
Author: dav
Date: Wed Nov 19 22:41:01 2008
New Revision: 2349

Modified:
   trunk/CMake/FindTeem.cmake
   trunk/CMakeLists.txt
   trunk/Engine/CMakeLists.txt
   trunk/Image/CMakeLists.txt
   trunk/Model/CMakeLists.txt
   trunk/Model/Readers/CMakeLists.txt
   trunk/UserInterface/CMakeLists.txt
Log:

I installed the latest teem from sourceforge svn.  I believe it is
version 1.10.0.  However, in the CMake files for teem 1.10.0, the
name of this variable:

TEEM_LIBRARY

has changed to:

Teem_LIBRARIES.

Additionally, Teem_INCLUDE_DIRS also has lowercase letters in it.
Finally, I'm using shared libraries, and thus all Manta libraries that
link vs other Manta libraries that require Teem need to explicitly
link in teem (at least on this box: Linux updraft2 2.6.9-67.0.22.ELsmp
#1 SMP Fri Jul 11 10:37:57 EDT 2008 x86_64 x86_64 x86_64 GNU/Linux).
I've updated the CMakeLists.txt file in the lib dirs to specify the
Teem libs.

I hope that this check in is ok.  If not, please let me know so we can
figure out the best way to proceed.  Also, someone probably should put
in a Teem version check to let users know if their Teem is too
old... or too new.



Modified: trunk/CMake/FindTeem.cmake
==============================================================================
--- trunk/CMake/FindTeem.cmake  (original)
+++ trunk/CMake/FindTeem.cmake  Wed Nov 19 22:41:01 2008
@@ -49,7 +49,7 @@
     INCLUDE_DIRECTORIES(${TEEM_INCLUDE_DIRS})
 
     # Find the library :)
-    FIND_LIBRARY(TEEM_LIBRARY teem ${TEEM_LIBRARY_DIRS})
+    FIND_LIBRARY(Teem_LIBRARIES teem ${Teem_LIBRARY_DIRS})
     #    LINK_DIRECTORIES   (${TEEM_LIBRARY_DIRS})
 
   ELSE (FOUND_TEEMCONFIG_CMAKE)

Modified: trunk/CMakeLists.txt
==============================================================================
--- trunk/CMakeLists.txt        (original)
+++ trunk/CMakeLists.txt        Wed Nov 19 22:41:01 2008
@@ -116,6 +116,11 @@
   ${OPENGL_INCLUDE_PATH}
   )
 
+IF (FOUND_TEEM) 
+  INCLUDE_DIRECTORIES(${Teem_INCLUDE_DIRS})
+  LINK_DIRECTORIES(${Teem_LIBRARY_DIRS})
+ENDIF (FOUND_TEEM)
+
 SET(MANTA_TARGET_LINK_LIBRARIES
   Manta_Factory
   Manta_UserInterface

Modified: trunk/Engine/CMakeLists.txt
==============================================================================
--- trunk/Engine/CMakeLists.txt (original)
+++ trunk/Engine/CMakeLists.txt Wed Nov 19 22:41:01 2008
@@ -9,6 +9,11 @@
 INCLUDE (SampleGenerators/CMakeLists.txt)
 INCLUDE (Shadows/CMakeLists.txt)
 
+IF (FOUND_TEEM) 
+  INCLUDE_DIRECTORIES(${Teem_INCLUDE_DIRS})
+  LINK_DIRECTORIES(${Teem_LIBRARY_DIRS})
+ENDIF (FOUND_TEEM)
+
 ADD_LIBRARY (Manta_Engine
              ${Manta_Control_SRCS}
              ${Manta_Display_SRCS}

Modified: trunk/Image/CMakeLists.txt
==============================================================================
--- trunk/Image/CMakeLists.txt  (original)
+++ trunk/Image/CMakeLists.txt  Wed Nov 19 22:41:01 2008
@@ -3,8 +3,8 @@
 
###############################################################################
 # Check to see if nrrd dependent files should be included.
 IF (FOUND_TEEM) 
-  INCLUDE_DIRECTORIES(${TEEM_INCLUDE_DIRS})
-  LINK_DIRECTORIES(${TEEM_LIBRARY_DIRS})
+  INCLUDE_DIRECTORIES(${Teem_INCLUDE_DIRS})
+  LINK_DIRECTORIES(${Teem_LIBRARY_DIRS})
   # Add the Nrrd read/write files to the build
   SET (NRRD_IMAGE_SRC NRRDFile.h NRRDFile.cc)  
 ELSE (FOUND_TEEM)
@@ -93,7 +93,7 @@
   # (TEEMLibraryDepends.cmake).  It is necessary to explicitly list
   # these files (to link against) when TEEM doesn't provide a shared
   # library.  (It doesn't hurt if TEEM does provide a shared lib.)
-  TARGET_LINK_LIBRARIES(Manta_Image ${TEEM_LIBRARY} ${teem_LIB_DEPENDS})
+  TARGET_LINK_LIBRARIES(Manta_Image ${Teem_LIBRARIES} ${teem_LIB_DEPENDS})
 ENDIF(FOUND_TEEM)
 
 IF(APPLE)

Modified: trunk/Model/CMakeLists.txt
==============================================================================
--- trunk/Model/CMakeLists.txt  (original)
+++ trunk/Model/CMakeLists.txt  Wed Nov 19 22:41:01 2008
@@ -13,6 +13,11 @@
 INCLUDE (Intersections/CMakeLists.txt)
 INCLUDE (Textures/CMakeLists.txt)
 
+IF (FOUND_TEEM) 
+  INCLUDE_DIRECTORIES(${Teem_INCLUDE_DIRS})
+  LINK_DIRECTORIES(${Teem_LIBRARY_DIRS})
+ENDIF (FOUND_TEEM)
+
 ADD_LIBRARY (Manta_Model
              ${Manta_AmbientLights_SRCS}
              ${Manta_Backgrounds_SRCS}

Modified: trunk/Model/Readers/CMakeLists.txt
==============================================================================
--- trunk/Model/Readers/CMakeLists.txt  (original)
+++ trunk/Model/Readers/CMakeLists.txt  Wed Nov 19 22:41:01 2008
@@ -42,9 +42,9 @@
     Readers/ParticleNRRD.h
     Readers/ParticleNRRD.cc
     )
-  INCLUDE_DIRECTORIES(${TEEM_INCLUDE_DIRS})
+  INCLUDE_DIRECTORIES(${Teem_INCLUDE_DIRS})
 
   SET(Manta_Model_extra_libs ${Manta_Model_extra_libs}
-    ${TEEM_LIBRARY}                                   
+    ${Teem_LIBRARIES}                                   
     )
 ENDIF(BUILD_NRRDPARTICLES)

Modified: trunk/UserInterface/CMakeLists.txt
==============================================================================
--- trunk/UserInterface/CMakeLists.txt  (original)
+++ trunk/UserInterface/CMakeLists.txt  Wed Nov 19 22:41:01 2008
@@ -11,6 +11,11 @@
   SyncFrameAutomator.h
   )
 
+IF (FOUND_TEEM) 
+  INCLUDE_DIRECTORIES(${Teem_INCLUDE_DIRS})
+  LINK_DIRECTORIES(${Teem_LIBRARY_DIRS})
+ENDIF (FOUND_TEEM)
+
 IF(MANTA_ENABLE_X11)
   SET(Manta_UserInterface_SRCS ${Manta_UserInterface_SRCS}
     XWindowUI.h

Archive powered by MHonArc 2.6.16.

Top of page