36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
diff -up a/CMakeLists.txt.plugindir b/CMakeLists.txt
|
|
--- a/CMakeLists.txt.plugindir 2015-02-07 21:42:44.431479900 +0100
|
|
+++ b/CMakeLists.txt 2015-02-07 21:43:29.000429326 +0100
|
|
@@ -24,7 +24,7 @@
|
|
# had too many 1.100.1 releases. :-)
|
|
set(BABEL_MAJ_VER 3)
|
|
set(BABEL_MIN_VER 1)
|
|
-set(BABEL_PATCH_VER 0)
|
|
+set(BABEL_PATCH_VER 1)
|
|
|
|
# This should be phased out in preference for just using the target name
|
|
set(BABEL_LIBRARY openbabel)
|
|
@@ -276,7 +276,7 @@
|
|
}
|
|
" SCANDIR_NEEDS_CONST)
|
|
|
|
- set(OB_MODULE_PATH "${CMAKE_INSTALL_PREFIX}/${OB_PLUGIN_INSTALL_DIR}")
|
|
+ set(OB_MODULE_PATH "${LIB_INSTALL_DIR}/openbabel3")
|
|
|
|
# Add some visibility support when using GCC
|
|
# note: Altough MinGW g++ 4.4 passes this test, visibility can't be used
|
|
@@ -751,11 +751,11 @@
|
|
|
|
# Now to configure the installed config file.
|
|
set(OB_CONFIG_DIR "${LIB_INSTALL_DIR}/cmake/openbabel3")
|
|
-set(OpenBabel3_INCLUDE_DIRS "\${OpenBabel3_INSTALL_PREFIX}/${OB_INCLUDE_DIRS}")
|
|
+set(OpenBabel3_INCLUDE_DIRS "\${INCLUDE_INSTALL_DIR}/openbabel3")
|
|
set(OpenBabel3_LIBRARIES "$<TARGET_FILE:openbabel>")
|
|
|
|
set(OB_EXPORTS_FILE
|
|
- "\${OpenBabel3_INSTALL_PREFIX}/${OB_CONFIG_DIR}/OpenBabel3_EXPORTS.cmake")
|
|
+ "\${LIB_INSTALL_DIR}/cmake/openbabel3/OpenBabel3_EXPORTS.cmake")
|
|
set(REL_REF)
|
|
if(NOT WIN32)
|
|
set(REL_REF "/../../..")
|