Text archives Help
- From: abe@sci.utah.edu
- To: manta@sci.utah.edu
- Subject: [MANTA] r1442 - in trunk: CMake Image
- Date: Mon, 2 Jul 2007 14:29:54 -0600 (MDT)
Author: abe
Date: Mon Jul 2 14:29:54 2007
New Revision: 1442
Modified:
trunk/CMake/FindTeem.cmake
trunk/Image/CMakeLists.txt
Log:
Modified to use the monolithic single library version of teem. Note
that it is necessary to build the latest version 1.10 from CVS instead
of the 1.9 source or binary download.
Instructions on the wiki
M CMake/FindTeem.cmake
M Image/CMakeLists.txt
Modified: trunk/CMake/FindTeem.cmake
==============================================================================
--- trunk/CMake/FindTeem.cmake (original)
+++ trunk/CMake/FindTeem.cmake Mon Jul 2 14:29:54 2007
@@ -36,7 +36,7 @@
# Search for TEEMConfig using a relative path
FIND_FILE(FOUND_TEEMCONFIG_CMAKE
TEEMConfig.cmake
- ${FOUND_TEEM_BIN}/../lib/TEEM-1.9
+ ${FOUND_TEEM_BIN}/../lib/TEEM-1.10
)
# Include the teem configuration.
@@ -50,7 +50,7 @@
# Add the include directory to the build
INCLUDE_DIRECTORIES(${TEEM_INCLUDE_DIRS})
- LINK_DIRECTORIES (${TEEM_LIBRARY_DIRS})
+ LINK_DIRECTORIES (${TEEM_LIBRARY_DIRS})
ELSE (FOUND_TEEMCONFIG_CMAKE)
# Warn about version.
Modified: trunk/Image/CMakeLists.txt
==============================================================================
--- trunk/Image/CMakeLists.txt (original)
+++ trunk/Image/CMakeLists.txt Mon Jul 2 14:29:54 2007
@@ -6,7 +6,7 @@
# Add the Nrrd read/write files to the build
SET (NRRD_IMAGE_SRC NRRDFile.h NRRDFile.cc)
- SET (NRRD_IMAGE_LIB nrrd ${nrrd_LIB_DEPENDS})
+ SET (NRRD_IMAGE_LIB teem)
ELSE (FOUND_TEEM)
# Add stubs for these functions
- [MANTA] r1442 - in trunk: CMake Image, abe, 07/02/2007
Archive powered by MHonArc 2.6.16.