projects
/
anna.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
1061cb8
)
Fix README about oracle integration
author
eramos
<diametersuite@gmail.com>
Mon, 6 Apr 2020 00:12:44 +0000
(
02:12
+0200)
committer
eramos
<diametersuite@gmail.com>
Mon, 6 Apr 2020 00:12:44 +0000
(
02:12
+0200)
CMakeLists.txt
patch
|
blob
|
history
README.md
patch
|
blob
|
history
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
5b73664
..
11a2a24
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-113,7
+113,7
@@
add_definitions(-DLDAP_DEPRECATED)
# General includes:
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
include_directories(/usr/include/libxml2)
# General includes:
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
include_directories(/usr/include/libxml2)
-include_directories(/usr/
lib/oracle/12.1/client64/include
)
+include_directories(/usr/
include/oracle/19.6/client64
)
# <source>
SUBDIRLIST(SUBDIRS ${CMAKE_CURRENT_SOURCE_DIR}/source)
# <source>
SUBDIRLIST(SUBDIRS ${CMAKE_CURRENT_SOURCE_DIR}/source)
diff --git
a/README.md
b/README.md
index
183544f
..
0c0cfd4
100644
(file)
--- a/
README.md
+++ b/
README.md
@@
-59,20
+59,11
@@
You could specify type of build, 'Debug' or 'Release', for example:
### Oracle:
https://help.ubuntu.com/community/Oracle%20Instant%20Client
### Oracle:
https://help.ubuntu.com/community/Oracle%20Instant%20Client
- Set 'ORACLE_HOME' environment variable in your profile, i.e.:
- export ORACLE_HOME=/usr/lib/oracle/12.1/client64/
- Be sure to create in that directory, a link to oracle includes,
- for example:
+ After instalation of basic/sqlplus/devel, edit CMakeLists.txt
+
and update oracle includes,
for example:
- > /usr/lib/oracle/12.1/client64$ ls -lrt
- total 8
- drwxr-xr-x 2 root root 4096 Feb 28 15:59 bin
- drwxr-xr-x 2 root root 4096 Feb 28 15:59 lib
- lrwxrwxrwx 1 root root 33 Feb 28 16:07 include -> /usr/include/oracle/12.1/client64
-
- The alternative is to edit SConstruct file directly to set
- oracle includes directory.
+ include_directories(/usr/include/oracle/<version>/client64/include)
### Oracle-OpenLDAP conflict:
as usual, Oracle is doing things very bad. Move the ldap.h from oracle includes, i.e.:
### Oracle-OpenLDAP conflict:
as usual, Oracle is doing things very bad. Move the ldap.h from oracle includes, i.e.: