Revision: 44619
http://brlcad.svn.sourceforge.net/brlcad/?rev=44619&view=rev
Author: erikgreenwald
Date: 2011-05-16 18:08:27 +0000 (Mon, 16 May 2011)
Log Message:
-----------
Expand on the OpenNURBS and Utah find routines a big - not making much use of
these yet, but the expanded tests happen to fail on Windows for the installed
BRL-CAD, which avoids some configure problems. Still haven't found a good way
yet to forcibly exclude the installed directory from the search on Windows.
(starseeker)
Modified Paths:
--------------
brlcad/trunk/misc/CMake/FindOPENNURBS.cmake
brlcad/trunk/misc/CMake/FindUTAHRLE.cmake
Modified: brlcad/trunk/misc/CMake/FindOPENNURBS.cmake
===================================================================
--- brlcad/trunk/misc/CMake/FindOPENNURBS.cmake 2011-05-16 18:06:26 UTC (rev
44618)
+++ brlcad/trunk/misc/CMake/FindOPENNURBS.cmake 2011-05-16 18:08:27 UTC (rev
44619)
@@ -1,10 +1,22 @@
-# - Find STEP Class Library binaries and libraries
+# - Find OpenNURBS
#
# The following variables are set:
#
-# OPENNURBS_LIBRARY
+# OPENNURBS_INCLUDE_DIRS - where to find zlib.h, etc.
+# OPENNURBS_LIBRARIES - List of libraries when using zlib.
+# OPENNURBS_FOUND - True if zlib found.
-FIND_LIBRARY(OPENNURBS_LIBRARY NAMES opennurbs openNURBS OpenNURBS
NO_CMAKE_PATH)
+FIND_PATH(OPENNURBS_INCLUDE_DIR opennurbs.h)
+MESSAGE("OPENNURBS_LIBRARY: ${OPENNURBS_LIBRARY}")
+FIND_LIBRARY(OPENNURBS_LIBRARY NAMES opennurbs openNURBS OpenNURBS)
+
+MESSAGE("OPENNURBS_LIBRARY: ${OPENNURBS_LIBRARY}")
+
INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(OPENNURBS DEFAULT_MSG OPENNURBS_LIBRARY)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(OPENNURBS DEFAULT_MSG OPENNURBS_LIBRARY
OPENNURBS_INCLUDE_DIR)
+
+IF (OPENNURBS_FOUND)
+ SET(OPENNURBS_INCLUDE_DIRS ${OPENNURBS_INCLUDE_DIR})
+ SET(OPENNURBS_LIBRARIES ${OPENNURBS_LIBRARY})
+ENDIF()
\ No newline at end of file
Modified: brlcad/trunk/misc/CMake/FindUTAHRLE.cmake
===================================================================
--- brlcad/trunk/misc/CMake/FindUTAHRLE.cmake 2011-05-16 18:06:26 UTC (rev
44618)
+++ brlcad/trunk/misc/CMake/FindUTAHRLE.cmake 2011-05-16 18:08:27 UTC (rev
44619)
@@ -1,10 +1,21 @@
-# - Find UtahRLE binaries and libraries
+# - Find UtahRLE libraries
#
# The following variables are set:
#
# UTAHRLE_LIBRARY
+# The following variables are set:
+#
+# UTAHRLE_INCLUDE_DIRS - where to find zlib.h, etc.
+# UTAHRLE_LIBRARIES - List of libraries when using zlib.
+# UTAHRLE_FOUND - True if zlib found.
-FIND_LIBRARY(UTAHRLE_LIBRARY NAMES utahrle)
+FIND_PATH(UTAHRLE_INCLUDE_DIR rle.h)
+FIND_LIBRARY(UTAHRLE_LIBRARY NAMES UTAHRLE)
INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(UTAHRLE DEFAULT_MSG UTAHRLE_LIBRARY)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(UTAHRLE DEFAULT_MSG UTAHRLE_LIBRARY
UTAHRLE_INCLUDE_DIR)
+
+IF (UTAHRLE_FOUND)
+ SET(UTAHRLE_INCLUDE_DIRS ${UTAHRLE_INCLUDE_DIR})
+ SET(UTAHRLE_LIBRARIES ${UTAHRLE_LIBRARY})
+ENDIF()
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Achieve unprecedented app performance and reliability
What every C/C++ and Fortran developer should know.
Learn how Intel has extended the reach of its next-generation tools
to help boost performance applications - inlcuding clusters.
http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
