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

Comparing branches/development/cmake/modules/FindOpenBabel2.cmake (file contents):
Revision 1498 by chuckv, Thu Sep 9 14:34:20 2010 UTC vs.
Revision 1626 by gezelter, Tue Sep 13 15:39:54 2011 UTC

# Line 4 | Line 4
4   #  OPENBABEL2_FOUND - system has OpenBabel2
5   #  OPENBABEL2_INCLUDE_DIR - the OpenBabel2 include directory
6   #  OPENBABEL2_LIBRARIES - Link these to use OpenBabel2
7 # Copyright (C) 2006, 2009 Pino Toscano, <pino@kde.org>
7   # Copyright (c) 2006, 2007 Carsten Niehaus, <cniehaus@gmx.de>
8   # Copyright (C) 2008 Marcus D. Hanwell <marcus@cryos.org>
9   # Redistribution and use is allowed according to the terms of the BSD license.
# Line 19 | Line 18 | else (OPENBABEL2_INCLUDE_DIR AND OPENBABEL2_LIBRARIES
18  
19      # Use the newer PkgConfig stuff
20      find_package(PkgConfig REQUIRED)
21 <    pkg_check_modules(PC_OPENBABEL2 openbabel-2.0>=2.2.0)
21 >    pkg_check_modules(OPENBABEL2 openbabel-2.0>=2.2.0)
22  
23 <    if(PC_OPENBABEL2_FOUND)
23 >    # Maintain backwards compatibility with previous version of module
24 >    if(OPENBABEL2_FOUND STREQUAL "1")
25        set(OPENBABEL2_VERSION_MET TRUE)
26 <    endif(PC_OPENBABEL2_FOUND)
26 >      set(OPENBABEL2_INCLUDE_DIR ${OPENBABEL2_INCLUDE_DIRS})
27 >    endif(OPENBABEL2_FOUND STREQUAL "1")
28  
29    else(NOT WIN32)
30      set(OPENBABEL2_VERSION_MET TRUE)
# Line 31 | Line 32 | else (OPENBABEL2_INCLUDE_DIR AND OPENBABEL2_LIBRARIES
32  
33    if(OPENBABEL2_VERSION_MET)
34  
35 <    find_path(OPENBABEL2_INCLUDE_DIR openbabel/obconversion.h
36 <      PATHS
37 <      ${PC_OPENBABEL2_INCLUDEDIR}
38 <      ${PC_OPENBABEL2_INCLUDE_DIRS}
39 <      ${GNUWIN32_DIR}/include
40 <      $ENV{OPENBABEL2_INCLUDE_DIR}
40 <      PATH_SUFFIXES openbabel-2.0
41 <    )
35 >   # find_path(OPENBABEL2_INCLUDE_DIR openbabel/obconversion.h
36 >   #   PATHS
37 >   #   ${_obIncDir}
38 >   #   ${GNUWIN32_DIR}/include
39 >   #   $ENV{OPENBABEL2_INCLUDE_DIR}
40 >   # )
41  
42 +    if(WIN32)
43 +      if(NOT OPENBABEL2_INCLUDE_DIR)
44 +        find_path(OPENBABEL2_INCLUDE_DIR openbabel-2.0/openbabel/obconversion.h
45 +          PATHS
46 +          ${_obIncDir}
47 +          ${GNUWIN32_DIR}/include
48 +          $ENV{OPENBABEL2_INCLUDE_DIR}
49 +        )
50 +        if(OPENBABEL2_INCLUDE_DIR)
51 +          set(OPENBABEL2_INCLUDE_DIR ${OPENBABEL2_INCLUDE_DIR}/openbabel-2.0)
52 +        endif(OPENBABEL2_INCLUDE_DIR)
53 +      endif(NOT OPENBABEL2_INCLUDE_DIR)
54 +    endif(WIN32)
55 +
56      find_library(OPENBABEL2_LIBRARIES NAMES openbabel openbabel-2
57        PATHS
58 <      ${PC_OPENBABEL2_LIBDIR}
46 <      ${PC_OPENBABEL2_LIBRARY_DIRS}
58 >      ${_obLinkDir}
59        ${GNUWIN32_DIR}/lib
60        $ENV{OPENBABEL2_LIBRARIES}
61      )

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines