Text archives Help

---

Author: bigler
Date: Thu Jun 26 13:36:08 2008
New Revision: 2294

Modified:
   trunk/CMake/FindLibXML2.cmake
   trunk/Core/CMakeLists.txt
   trunk/Model/Readers/CMakeLists.txt
Log:
CMake/FindLibXML2.cmake

  Did a little formatting of the code.

  Added new LIBXML2_FOUND variable.  Check this variable for the existence of
  this library instead of LIBXML2_LIBRARY or LIBXML2_INCLUDE.

Core/CMakeLists.txt
Model/Readers/CMakeLists.txt

  Use LIBXML2_FOUND instead of LIBXML2_INCLUDE and LIBXML2_LIBRARY.


Modified: trunk/CMake/FindLibXML2.cmake
==============================================================================
--- trunk/CMake/FindLibXML2.cmake       (original)
+++ trunk/CMake/FindLibXML2.cmake       Thu Jun 26 13:36:08 2008
@@ -5,10 +5,31 @@
 # Look for library here before you look in Thirdparty path
 SET(LIBXML2_INSTALL_PATH "" CACHE PATH "Default search path for libxml2 
install")
 
-FIND_LIBRARY( LIBXML2_LIBRARY NAMES xml2 libxml2
-              PATHS ${LIBXML2_INSTALL_PATH}/lib ${THIRD_PARTY_LIBRARY_PATH} 
/usr/lib /usr/local/lib /usr/lib
-              DOC "libxml2 library (This is a path.)" )
-FIND_PATH   ( LIBXML2_INCLUDE libxml/tree.h ${LIBXML2_INSTALL_PATH}/include 
${THIRD_PARTY_INCLUDE_PATH} /usr/include/libxml2 /usr/include 
/usr/local/include /usr/include
-              DOC "libxml2 Include (This is a path.)" )
+FIND_LIBRARY( LIBXML2_LIBRARY
+  NAMES xml2 libxml2
+  PATHS ${LIBXML2_INSTALL_PATH}/lib
+        ${THIRD_PARTY_LIBRARY_PATH}
+        /usr/lib
+        /usr/local/lib
+        /usr/lib
+  DOC "libxml2 library (This is a path.)"
+  )
+FIND_PATH( LIBXML2_INCLUDE
+  NAMES libxml/tree.h
+  PATHS ${LIBXML2_INSTALL_PATH}/include
+        ${THIRD_PARTY_INCLUDE_PATH}
+        /usr/include/libxml2
+        /usr/include
+        /usr/local/include
+        /usr/include
+  DOC "libxml2 Include (This is a path.)"
+  )
+
+MARK_AS_ADVANCED(LIBXML2_LIBRARY LIBXML2_INCLUDE)
+
+IF(LIBXML2_LIBRARY AND LIBXML2_INCLUDE)
+  SET(LIBXML2_FOUND TRUE)
+ELSE(LIBXML2_LIBRARY AND LIBXML2_INCLUDE)
+  SET(LIBXML2_FOUND FALSE)
+ENDIF(LIBXML2_LIBRARY AND LIBXML2_INCLUDE)
 
-MARK_AS_ADVANCED(FOUND_LIBXML2_LIB FOUND_LIBXML2_INCLUDE)

Modified: trunk/Core/CMakeLists.txt
==============================================================================
--- trunk/Core/CMakeLists.txt   (original)
+++ trunk/Core/CMakeLists.txt   Thu Jun 26 13:36:08 2008
@@ -98,12 +98,12 @@
      Persistent/MantaRTTI.cc
      )
 
-IF (LIBXML2_INCLUDE)
+IF (LIBXML2_FOUND)
      SET (CORE_SOURCES ${CORE_SOURCES}
           Persistent/XMLArchive.cc
          )
      INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE})
-ENDIF (LIBXML2_INCLUDE)
+ENDIF (LIBXML2_FOUND)
 
 # Sources of Core/Thread classes
 SET(CORE_SOURCES ${CORE_SOURCES}
@@ -182,9 +182,9 @@
 
 ADD_LIBRARY (Manta_Core ${CORE_SOURCES})
 
-IF(LIBXML2_LIBRARY)
+IF(LIBXML2_FOUND)
   TARGET_LINK_LIBRARIES(Manta_Core ${LIBXML2_LIBRARY})
-ENDIF(LIBXML2_LIBRARY)
+ENDIF(LIBXML2_FOUND)
 
 IF (CMAKE_USE_PTHREADS_INIT)
   TARGET_LINK_LIBRARIES(Manta_Core ${CMAKE_THREAD_LIBS_INIT})

Modified: trunk/Model/Readers/CMakeLists.txt
==============================================================================
--- trunk/Model/Readers/CMakeLists.txt  (original)
+++ trunk/Model/Readers/CMakeLists.txt  Thu Jun 26 13:36:08 2008
@@ -10,7 +10,7 @@
   Readers/UDAReader.h
   )
 
-IF (LIBXML2_INCLUDE AND ZLIB_FOUND)
+IF (LIBXML2_FOUND AND ZLIB_FOUND)
      SET (Manta_Readers_SRCS ${Manta_Readers_SRCS}
           Readers/UDAReader.cc
          )
@@ -20,12 +20,12 @@
     ${ZLIB_LIBRARY}         
     )
 
-ELSE (LIBXML2_INCLUDE AND ZLIB_FOUND)
+ELSE (LIBXML2_FOUND AND ZLIB_FOUND)
    SET (Manta_Readers_SRCS ${Manta_Readers_SRCS}
           Readers/UDAReader-stub.cc
          )
 
-ENDIF (LIBXML2_INCLUDE AND ZLIB_FOUND)
+ENDIF (LIBXML2_FOUND AND ZLIB_FOUND)
 
 
 # Apple places malloc.h in /usr/include/malloc/malloc.h

---

• [Manta] r2294 - in trunk: CMake Core Model/Readers, James Bigler, 06/26/2008

---

Archive powered by MHonArc 2.6.16.