improve OVM Finder

cmake/FindOpenVolumeMesh.cmake

@@ -28,37 +28,36 @@
 # along with HexEx.  If not, see <http://www.gnu.org/licenses/>.
 #   
 
-IF (OPENVOLUMEMESH_INCLUDE_DIR)
+IF (OPENVOLUMEMESH_INCLUDE_DIR AND OPENVOLUMEMESH_LIBRARY)
   # Already in cache, be silent
   SET(OPENVOLUMEMESH_FIND_QUIETLY TRUE)
-ENDIF (OPENVOLUMEMESH_INCLUDE_DIR)
+ENDIF (OPENVOLUMEMESH_INCLUDE_DIR AND OPENVOLUMEMESH_LIBRARY)
+
+SET (SEARCH_PATHS
+  /usr/local
+  /usr
+  /usr/local/OpenVolumeMesh
+  "${CMAKE_SOURCE_DIR}/OpenVolumeMesh"
+  "${CMAKE_SOURCE_DIR}/libs_required/OpenVolumeMesh"
+  "${CMAKE_SOURCE_DIR}/../OpenVolumeMesh"
+  /ACG/acgdev/gcc-4.0-x86_64/OVM/OpenVolumeMesh/installed
+  "C:\\Program Files\\OpenVolumeMesh"
+)
 
 FIND_PATH(OPENVOLUMEMESH_INCLUDE_DIR OpenVolumeMesh/Mesh/TetrahedralMesh.hh
-	  PATHS /usr/local/include 
-                /usr/include 
-                /usr/local/OpenVolumeMesh/include
-                "${CMAKE_SOURCE_DIR}/OpenVolumeMesh/src"
-                "${CMAKE_SOURCE_DIR}/libs_required/OpenVolumeMesh/src"
-                "${CMAKE_SOURCE_DIR}/../OpenVolumeMesh/src"
-                /ACG/acgdev/gcc-4.0-x86_64/OVM/OpenVolumeMesh/installed/include
-		    "C:\\Program Files\\OpenVolumeMesh\\include"
-                )
+  PATHS ${SEARCH_PATHS}
+  PATH_SUFFIXES include src
+)
+
+FIND_LIBRARY(OPENVOLUMEMESH_LIBRARY OpenVolumeMesh
+  PATHS ${SEARCH_PATHS}
+  PATH_SUFFIXES lib lib/OpenVolumeMesh
+)
 
-IF (OPENVOLUMEMESH_INCLUDE_DIR )
+IF (OPENVOLUMEMESH_INCLUDE_DIR AND OPENVOLUMEMESH_LIBRARY)
    SET(OPENVOLUMEMESH_FOUND TRUE)
    ADD_DEFINITIONS(-DENABLE_OPENVOLUMEMESH)
-IF (WIN32)
-	IF(EXISTS "${OPENVOLUMEMESH_INCLUDE_DIR}/../lib")
-		SET(OPENVOLUMEMESH_LIBRARY_DIR "${OPENVOLUMEMESH_INCLUDE_DIR}/../lib")
-	ENDIF()
-ELSE (WIN32)
-	IF(EXISTS "${OPENVOLUMEMESH_INCLUDE_DIR}/../lib/OpenVolumeMesh")
-   		SET(OPENVOLUMEMESH_LIBRARY_DIR "${OPENVOLUMEMESH_INCLUDE_DIR}/../lib/OpenVolumeMesh")
-  ENDIF()
-
-ENDIF (WIN32)
-   SET(OPENVOLUMEMESH_LIBRARY "OpenVolumeMesh")
-ELSE (OPENVOLUMEMESH_INCLUDE_DIR)
-   SET(OPENVOLUMEMESH_FOUND FALSE )
-ENDIF (OPENVOLUMEMESH_INCLUDE_DIR )
+ELSE (OPENVOLUMEMESH_INCLUDE_DIR AND OPENVOLUMEMESH_LIBRARY)
+   SET(OPENVOLUMEMESH_FOUND FALSE)
+ENDIF (OPENVOLUMEMESH_INCLUDE_DIR AND OPENVOLUMEMESH_LIBRARY)