Quellcode durchsuchen

db_oracle: fix db_oracle build for oracle 18.3.0.0.0

(cherry picked from commit 77ce71fcd4cfb6f0f86313d95341e4abd0031b2c)
Ovidiu Sas vor 7 Monaten
Ursprung
Commit
3ba48f9a83
2 geänderte Dateien mit 5 neuen und 2 gelöschten Zeilen
  1. 3 0
      cmake/modules/FindOracle.cmake
  2. 2 2
      src/modules/db_oracle/CMakeLists.txt

+ 3 - 0
cmake/modules/FindOracle.cmake

@@ -29,6 +29,9 @@ if(NOT ORACLE_HOME)
   if(EXISTS $ENV{ORACLE_HOME})
     set(ORACLE_HOME $ENV{ORACLE_HOME})
   endif()
+  if(EXISTS $ENV{ORACLE_INCLUDE_DIR})
+    set(ORACLE_INCLUDE_DIR $ENV{ORACLE_INCLUDE_DIR})
+  endif()
 endif()
 
 message(STATUS "ORACLE_HOME=${ORACLE_HOME}")

+ 2 - 2
src/modules/db_oracle/CMakeLists.txt

@@ -6,5 +6,5 @@ add_library(${module_name} SHARED ${MODULE_SOURCES})
 find_package(Oracle REQUIRED)
 
 # /usr/include/oracle/18.3/client64)
-target_include_directories(${module_name} PRIVATE ${Oracle_INCLUDE_DIRS})
-target_link_libraries(${module_name} PRIVATE occi clntsh)
+target_include_directories(${module_name} PRIVATE ${ORACLE_INCLUDE_DIR})
+target_link_libraries(${module_name} PRIVATE ${ORACLE_LIBRARIES})