From 78959d8034c28a089287fe7287deaaf629000a3c Mon Sep 17 00:00:00 2001 From: Cekis Date: Sat, 11 Dec 2021 22:57:25 -0500 Subject: [PATCH] Fixed issue for newer compilers and adjusted Oracle and chat for compilation --- cmake/linux/FindOracle.cmake | 2 +- external/3rd/library/platform/utils/Base/Archive.cpp | 2 +- external/3rd/library/udplibrary/CMakeLists.txt | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cmake/linux/FindOracle.cmake b/cmake/linux/FindOracle.cmake index 29091041..d6074ead 100644 --- a/cmake/linux/FindOracle.cmake +++ b/cmake/linux/FindOracle.cmake @@ -25,7 +25,7 @@ # If ORACLE_HOME not defined, assume Oracle libraries not available if(DEFINED ENV{ORACLE_HOME}) - set(ORACLE_HOME ${CMAKE_ORACLE_DIR}) + set(ORACLE_HOME $ENV{ORACLE_HOME}) find_path(ORACLE_INCLUDE_DIR NAMES oci.h diff --git a/external/3rd/library/platform/utils/Base/Archive.cpp b/external/3rd/library/platform/utils/Base/Archive.cpp index 11e235b9..ec1a8c8b 100755 --- a/external/3rd/library/platform/utils/Base/Archive.cpp +++ b/external/3rd/library/platform/utils/Base/Archive.cpp @@ -81,7 +81,7 @@ namespace Base { } - ByteStream::ReadIterator::~ReadIterator() + Base::ReadIterator::~ReadIterator() { stream = 0; } diff --git a/external/3rd/library/udplibrary/CMakeLists.txt b/external/3rd/library/udplibrary/CMakeLists.txt index a3498814..50c4163e 100644 --- a/external/3rd/library/udplibrary/CMakeLists.txt +++ b/external/3rd/library/udplibrary/CMakeLists.txt @@ -21,3 +21,4 @@ add_library(udplibrary UdpLibrary.h ) +target_include_directories(udplibrary PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})