]>
Commit | Line | Data |
---|---|---|
674189f4 JB |
1 | --- openbabel-2.3.1/CMakeLists.txt.orig 2011-09-15 21:45:59.000000000 +0200 |
2 | +++ openbabel-2.3.1/CMakeLists.txt 2011-10-21 17:52:35.278016550 +0200 | |
eebeb7a7 JB |
3 | @@ -45,17 +45,17 @@ |
4 | CACHE PATH "Install dir for binaries") | |
5 | set(LIB_SUFFIX "" CACHE STRING "Suffix of the directory name, e.g. 64 for lib64") | |
6 | if(UNIX) | |
7 | - set(LIB_INSTALL_DIR "lib${LIB_SUFFIX}" | |
8 | + set(OBLIB_INSTALL_DIR "lib${LIB_SUFFIX}" | |
9 | CACHE PATH "Install dir for libraries") | |
10 | if(ENABLE_VERSIONED_FORMATS) | |
11 | - set(OB_PLUGIN_INSTALL_DIR "${LIB_INSTALL_DIR}/openbabel/${BABEL_VERSION}" | |
12 | + set(OB_PLUGIN_INSTALL_DIR "${OBLIB_INSTALL_DIR}/openbabel/${BABEL_VERSION}" | |
13 | CACHE PATH "Install dir for plugins") | |
14 | else() | |
15 | - set(OB_PLUGIN_INSTALL_DIR "${LIB_INSTALL_DIR}/openbabel" | |
16 | + set(OB_PLUGIN_INSTALL_DIR "${OBLIB_INSTALL_DIR}/openbabel" | |
17 | CACHE PATH "Install dir for plugins") | |
18 | endif() | |
19 | else() # Windows - bin dir = lib dir to load libraries | |
20 | - set(LIB_INSTALL_DIR "${BIN_INSTALL_DIR}" | |
21 | + set(OBLIB_INSTALL_DIR "${BIN_INSTALL_DIR}" | |
22 | CACHE PATH "Install dir for libraries") | |
23 | if(MSVC) | |
24 | set(OB_PLUGIN_INSTALL_DIR "${BIN_INSTALL_DIR}" | |
674189f4 | 25 | @@ -351,9 +351,9 @@ |
eebeb7a7 JB |
26 | # Some rpath handling for Linux and Mac |
27 | if(UNIX AND BUILD_SHARED) | |
28 | if(APPLE) | |
29 | - set(CMAKE_INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}) | |
30 | + set(CMAKE_INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/${OBLIB_INSTALL_DIR}) | |
31 | else() | |
32 | - set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}") | |
33 | + set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${OBLIB_INSTALL_DIR}") | |
34 | set(CMAKE_SKIP_BUILD_RPATH FALSE) | |
35 | set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) | |
36 | set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) | |
674189f4 | 37 | @@ -487,7 +487,7 @@ |
eebeb7a7 JB |
38 | "${openbabel_BINARY_DIR}/OpenBabel2ConfigVersion.cmake" @ONLY) |
39 | ||
40 | # Now to configure the installed config file. | |
674189f4 JB |
41 | -set(OB_CONFIG_DIR "${LIB_INSTALL_DIR}/cmake/openbabel2") |
42 | +set(OB_CONFIG_DIR "${OBLIB_INSTALL_DIR}/cmake/openbabel2") | |
eebeb7a7 JB |
43 | set(OpenBabel2_INCLUDE_DIRS "\${OpenBabel2_INSTALL_PREFIX}/${OB_INCLUDE_DIRS}") |
44 | set(OB_EXPORTS_FILE | |
45 | "\${OpenBabel2_INSTALL_PREFIX}/${OB_CONFIG_DIR}/OpenBabel2_EXPORTS.cmake") |