ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/cmake/modules/FindQhull.cmake
(Generate patch)

Comparing branches/development/cmake/modules/FindQhull.cmake (file contents):
Revision 1694 by gezelter, Thu Mar 15 23:51:48 2012 UTC vs.
Revision 1704 by gezelter, Tue Apr 24 20:40:04 2012 UTC

# Line 6 | Line 6
6   # QHULL_INCLUDE_DIRS - Directories containing the QHULL include files.
7   # QHULL_LIBRARIES - Libraries needed to use QHULL.
8   # QHULL_DEFINITIONS - Compiler flags for QHULL.
9 + # If QHULL_USE_STATIC is specified then look for static libraries ONLY else
10 + # look for shared ones
11  
12   set(QHULL_MAJOR_VERSION 6)
13  
14 + if(QHULL_USE_STATIC)
15 +  set(QHULL_RELEASE_NAME qhullstatic)
16 +  set(QHULL_DEBUG_NAME qhullstatic_d)
17 + else(QHULL_USE_STATIC)
18 +  set(QHULL_RELEASE_NAME qhull qhull${QHULL_MAJOR_VERSION})
19 +  set(QHULL_DEBUG_NAME qhull_d qhull${QHULL_MAJOR_VERSION}_d qhull_d${QHULL_MAJOR_VERSION})
20 + endif(QHULL_USE_STATIC)
21 +
22 +
23   find_file(QHULL_HEADER
24            NAMES libqhull/libqhull.h qhull.h
25            HINTS "${QHULL_ROOT}" "$ENV{QHULL_ROOT}" "${QHULL_INCLUDE_DIR}"
26            PATHS "$ENV{PROGRAMFILES}/QHull" "$ENV{PROGRAMW6432}/QHull"
16 –                "$ENV{PROGRAMFILES}/qhull 6.2.0.1373" "$ENV{PROGRAMW6432}/qhull 6.2.0.1373"
27            PATH_SUFFIXES qhull src/libqhull libqhull include)
28  
29   set(QHULL_HEADER "${QHULL_HEADER}" CACHE INTERNAL "QHull header" FORCE )
# Line 34 | Line 44 | set(QHULL_INCLUDE_DIR "${QHULL_INCLUDE_DIR}" CACHE PAT
44  
45   set(QHULL_INCLUDE_DIR "${QHULL_INCLUDE_DIR}" CACHE PATH "QHull include dir." FORCE)
46  
47 < # Prefer static libraries in Windows over shared ones
48 < if(WIN32)
49 <  find_library(QHULL_LIBRARY
50 <               NAMES qhullstatic qhull qhull${QHULL_MAJOR_VERSION}
51 <               HINTS "${QHULL_ROOT}" "$ENV{QHULL_ROOT}"
42 <               PATHS "$ENV{PROGRAMFILES}/QHull" "$ENV{PROGRAMW6432}/QHull"
43 <                     "$ENV{PROGRAMFILES}/qhull 6.2.0.1373" "$ENV{PROGRAMW6432}/qhull 6.2.0.1373"
44 <               PATH_SUFFIXES project build bin lib)
47 > find_library(QHULL_LIBRARY
48 >             NAMES ${QHULL_RELEASE_NAME}
49 >             HINTS "${QHULL_ROOT}" "$ENV{QHULL_ROOT}"
50 >             PATHS "$ENV{PROGRAMFILES}/QHull" "$ENV{PROGRAMW6432}/QHull"
51 >             PATH_SUFFIXES project build bin lib)
52  
53 <  find_library(QHULL_LIBRARY_DEBUG
54 <               NAMES qhullstatic_d qhull_d qhull${QHULL_MAJOR_VERSION}_d qhull qhull${QHULL_MAJOR_VERSION}
55 <               HINTS "${QHULL_ROOT}" "$ENV{QHULL_ROOT}"
56 <               PATHS "$ENV{PROGRAMFILES}/QHull" "$ENV{PROGRAMW6432}/QHull"
57 <                     "$ENV{PROGRAMFILES}/qhull 6.2.0.1373" "$ENV{PROGRAMW6432}/qhull 6.2.0.1373"
51 <               PATH_SUFFIXES project build bin lib)
52 < else(WIN32)
53 <  find_library(QHULL_LIBRARY
54 <               NAMES qhull qhull${QHULL_MAJOR_VERSION}
55 <               HINTS "${QHULL_ROOT}" "$ENV{QHULL_ROOT}"
56 <               PATH_SUFFIXES project build bin lib)
53 > find_library(QHULL_LIBRARY_DEBUG
54 >             NAMES ${QHULL_DEBUG_NAME} ${QHULL_RELEASE_NAME}
55 >             HINTS "${QHULL_ROOT}" "$ENV{QHULL_ROOT}"
56 >             PATHS "$ENV{PROGRAMFILES}/QHull" "$ENV{PROGRAMW6432}/QHull"
57 >             PATH_SUFFIXES project build bin lib)
58  
58 –  find_library(QHULL_LIBRARY_DEBUG
59 –               NAMES qhull_d qhull_d${QHULL_MAJOR_VERSION} qhull qhull${QHULL_MAJOR_VERSION}
60 –               HINTS "${QHULL_ROOT}" "$ENV{QHULL_ROOT}"
61 –               PATH_SUFFIXES project build bin lib)
62 – endif(WIN32)
63 –
59   if(NOT QHULL_LIBRARY_DEBUG)
60    set(QHULL_LIBRARY_DEBUG ${QHULL_LIBRARY})
61   endif(NOT QHULL_LIBRARY_DEBUG)
# Line 69 | Line 64 | include(FindPackageHandleStandardArgs)
64   set(QHULL_LIBRARIES optimized ${QHULL_LIBRARY} debug ${QHULL_LIBRARY_DEBUG})
65  
66   include(FindPackageHandleStandardArgs)
67 < find_package_handle_standard_args(Qhull DEFAULT_MSG QHULL_LIBRARY
73 <    QHULL_INCLUDE_DIR)
67 > find_package_handle_standard_args(Qhull DEFAULT_MSG QHULL_LIBRARY QHULL_INCLUDE_DIR)
68  
69   mark_as_advanced(QHULL_LIBRARY QHULL_LIBRARY_DEBUG QHULL_INCLUDE_DIR)
70  
71   if(QHULL_FOUND)
72    set(HAVE_QHULL ON)
73 <  get_filename_component(qhull_lib ${QHULL_LIBRARY} NAME_WE)
80 <  if(NOT "${qhull_lib}" STREQUAL "qhullstatic")
73 >  if(NOT QHULL_USE_STATIC)
74      add_definitions("-Dqh_QHpointer")
75 <  endif(NOT "${qhull_lib}" STREQUAL "qhullstatic")
75 >    if(MSVC)
76 >      add_definitions("-Dqh_QHpointer_dllimport")
77 >    endif(MSVC)
78 >  endif(NOT QHULL_USE_STATIC)
79    message(STATUS "QHULL found (include: ${QHULL_INCLUDE_DIRS}, lib: ${QHULL_LIBRARIES})")
80   endif(QHULL_FOUND)

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines