Text archives Help

---

Author: bigler
Date: Wed Nov  7 13:36:19 2007
New Revision: 1831

Modified:
   trunk/CMake/FindOpenEXR.cmake
   trunk/Image/CMakeLists.txt
   trunk/Model/Readers/CMakeLists.txt
Log:
CMake/FindOpenEXR.cmake

  Added cache variable OpenEXR_PREFIX that should allow you to specify
  a different location for OpenEXR.

  Added Iex library, because my system wanted it.

  OpenEXR_FOUND is set to true only if all the libraries are found
  (previously only checked for one).

  Added OpenEXR_LIBRARIES variable that has all the OpenEXR libraries
  in a single list for easier consumption.

Image/CMakeLists.txt

  Get rid of some dead code.

  Use OpenEXR_LIBRARIES instead of the individual libraries.

Model/Readers/CMakeLists.txt

  Fix whitespace and formatting.


Modified: trunk/CMake/FindOpenEXR.cmake
==============================================================================
--- trunk/CMake/FindOpenEXR.cmake       (original)
+++ trunk/CMake/FindOpenEXR.cmake       Wed Nov  7 13:36:19 2007
@@ -8,7 +8,8 @@
 #                           extra test to make sure that we actually have 
the 
 #                           development packages around.
 
-SET( system_path "/usr/local" "/usr" )
+SET( OpenEXR_PREFIX "" CACHE PATH "Prefix path to where OpenEXR is 
installed")
+SET( system_path ${OpenEXR_PREFIX} "/usr/local" "/usr" )
 IF ( APPLE )
   SET( system_path ${system_path} "/opt/local" )
 ENDIF ( APPLE )
@@ -24,18 +25,20 @@
 FIND_LIBRARY( OpenEXR_LIB "IlmImf" ${library_path} )
 FIND_LIBRARY( OpenEXR_Half_LIB "Half" ${library_path} )
 FIND_LIBRARY( OpenEXR_Math_LIB "Imath" ${library_path} )
+FIND_LIBRARY( OpenEXR_Iex_LIB "Iex" ${library_path} )
 
 FIND_FILE( OpenEXR_H "OpenEXR/ImfIO.h" ${include_path} )
 
-MARK_AS_ADVANCED( OpenEXR_LIB OpenEXR_Half_LIB OpenEXR_Math_LIB OpenEXR_H )
+MARK_AS_ADVANCED( OpenEXR_LIB OpenEXR_Half_LIB OpenEXR_Math_LIB 
OpenEXR_Iex_LIB OpenEXR_H )
 
-IF( OpenEXR_H AND OpenEXR_LIB)
+IF( OpenEXR_LIB AND OpenEXR_Half_LIB AND OpenEXR_Math_LIB AND 
OpenEXR_Iex_LIB AND OpenEXR_H)
   SET(OpenEXR_FOUND TRUE)
   GET_FILENAME_COMPONENT(OpenEXR_Include_Dir ${OpenEXR_H}
                          PATH)
   GET_FILENAME_COMPONENT(OpenEXR_Lib_Dir ${OpenEXR_LIB}
                          PATH)
-ELSE(OpenEXR_H AND OpenEXR_LIB)
+  SET(OpenEXR_LIBRARIES ${OpenEXR_LIB} ${OpenEXR_Half_LIB} 
${OpenEXR_Math_LIB} ${OpenEXR_Iex_LIB})
+ELSE( OpenEXR_LIB AND OpenEXR_Half_LIB AND OpenEXR_Math_LIB AND 
OpenEXR_Iex_LIB AND OpenEXR_H)
   SET(OpenEXR_FOUND FALSE)
-ENDIF(OpenEXR_H AND OpenEXR_LIB)
+ENDIF( OpenEXR_LIB AND OpenEXR_Half_LIB AND OpenEXR_Math_LIB AND 
OpenEXR_Iex_LIB AND OpenEXR_H)
 

Modified: trunk/Image/CMakeLists.txt
==============================================================================
--- trunk/Image/CMakeLists.txt  (original)
+++ trunk/Image/CMakeLists.txt  Wed Nov  7 13:36:19 2007
@@ -36,9 +36,6 @@
   # Add the EXR files
   SET (EXR_SRC EXRFile.h EXRFile.cc)
   INCLUDE_DIRECTORIES(${OpenEXR_Include_Dir})
-  GET_SOURCE_FILE_PROPERTY(prop EXRFile.cc COMPILE_FLAGS)
-#  SET_SOURCE_FILES_PROPERTIES(EXRFile.cc
-#                              PROPERTIES INCLUDE_DIRECTORIES 
${OpenEXR_Include_Dir})
 ELSE(OpenEXR_FOUND)
   SET (EXR_SRC EXRFile.h EXRFile-stub.cc)
 ENDIF(OpenEXR_FOUND)
@@ -79,7 +76,7 @@
 ENDIF(ImageMagickPP_FOUND)
                     
 IF (OpenEXR_FOUND)
-  TARGET_LINK_LIBRARIES(Manta_Image ${OpenEXR_LIB} ${OpenEXR_Half_LIB} 
${OpenEXR_Math_LIB}  )
+  TARGET_LINK_LIBRARIES(Manta_Image ${OpenEXR_LIBRARIES} )
 ENDIF(OpenEXR_FOUND)
                     
 IF(FOUND_TEEM)

Modified: trunk/Model/Readers/CMakeLists.txt
==============================================================================
--- trunk/Model/Readers/CMakeLists.txt  (original)
+++ trunk/Model/Readers/CMakeLists.txt  Wed Nov  7 13:36:19 2007
@@ -1,44 +1,48 @@
 
 SET (Manta_Readers_SRCS
-     Readers/glm/glm.h
-     Readers/glm/glm.cc
-     Readers/rply/rply.c
-     Readers/IW.cc
-     Readers/PlyReader.cc
-     Readers/V3C1.h
-     Readers/V3C1.cc
-)
+  Readers/glm/glm.h
+  Readers/glm/glm.cc
+  Readers/rply/rply.c
+  Readers/IW.cc
+  Readers/PlyReader.cc
+  Readers/V3C1.h
+  Readers/V3C1.cc
+  )
 
 
 # Apple places malloc.h in /usr/include/malloc/malloc.h
 IF (APPLE)
-   INCLUDE_DIRECTORIES(/usr/include/malloc/)
+  INCLUDE_DIRECTORIES(/usr/include/malloc/)
 ENDIF (APPLE)
 
 IF(FOUND_TEEM)
-   SET(Manta_Readers_SRCS
-       ${Manta_Readers_SRCS}
-       Readers/VolumeNRRD.h
-       Readers/VolumeNRRD.cc
-   )
-   INCLUDE_DIRECTORIES(${TEEM_INCLUDE_DIRS})
-   LINK_DIRECTORIES   (${TEEM_LIBRARY_DIRS})
+  SET(Manta_Readers_SRCS
+    ${Manta_Readers_SRCS}
+    Readers/VolumeNRRD.h
+    Readers/VolumeNRRD.cc
+    )
+  INCLUDE_DIRECTORIES(${TEEM_INCLUDE_DIRS})
+  SET(Manta_Model_extra_libs ${Manta_Model_extra_libs}
+    ${TEEM_LIBRARY}                                   
+    )
 ELSE (FOUND_TEEM)
-   SET(Manta_Readers_SRCS
-       ${Manta_Readers_SRCS}
-       Readers/VolumeNRRD.h
-       Readers/VolumeNRRD-stub.cc
-   )
+  SET(Manta_Readers_SRCS
+    ${Manta_Readers_SRCS}
+    Readers/VolumeNRRD.h
+    Readers/VolumeNRRD-stub.cc
+    )
 ENDIF(FOUND_TEEM)
 
 
 # Reader for NRRD particle data
 IF(BUILD_NRRDPARTICLES)
-   SET(Manta_Readers_SRCS
-       ${Manta_Readers_SRCS}
-       Readers/ParticleNRRD.h
-       Readers/ParticleNRRD.cc
-   )
-   INCLUDE_DIRECTORIES(${TEEM_INCLUDE_DIRS})
-   LINK_DIRECTORIES   (${TEEM_LIBRARY_DIRS})
+  SET(Manta_Readers_SRCS
+    ${Manta_Readers_SRCS}
+    Readers/ParticleNRRD.h
+    Readers/ParticleNRRD.cc
+    )
+  INCLUDE_DIRECTORIES(${TEEM_INCLUDE_DIRS})
+  SET(Manta_Model_extra_libs ${Manta_Model_extra_libs}
+    ${TEEM_LIBRARY}                                   
+    )
 ENDIF(BUILD_NRRDPARTICLES)

---

• [Manta] r1831 - in trunk: CMake Image Model/Readers, bigler, 11/07/2007

---

Archive powered by MHonArc 2.6.16.