From a4e3f44feca3a4adb898454e681f010841658b78 Mon Sep 17 00:00:00 2001 From: Cekis Date: Fri, 10 Dec 2021 14:11:28 -0500 Subject: [PATCH] Fixed issues with CMake configuration --- CMakeLists.txt | 3 +-- cmake/linux/FindOracle.cmake | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0b20dead..f093b716 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,7 +35,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) # shame on you cmake for auto-setting optimization flags! -set(CMAKE_CXX_FLAGS "") set(CMAKE_CXX_FLAGS_DEBUG "") set(CMAKE_CXX_FLAGS_RELEASE "") set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "") @@ -107,7 +106,7 @@ elseif (UNIX) # RELWITHDEBINFO is used for building bins that produce profdata files # we only need the basics of our heavy optimizations here, i think - that and one of these flags # breaks JNI when we profile - set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-Ofast -finline-hint-functions -fprofile-instr-generate -g -fcoverage-mapping") + set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS} -Ofast -finline-hint-functions -fprofile-instr-generate -g -fcoverage-mapping") # MINSIZEREL is used for profiled, flto builds set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_RELEASE} -flto -fwhole-program-vtables") diff --git a/cmake/linux/FindOracle.cmake b/cmake/linux/FindOracle.cmake index d86c1bf8..29091041 100644 --- a/cmake/linux/FindOracle.cmake +++ b/cmake/linux/FindOracle.cmake @@ -25,13 +25,12 @@ # If ORACLE_HOME not defined, assume Oracle libraries not available if(DEFINED ENV{ORACLE_HOME}) - set(ORACLE_HOME $ENV{ORACLE_HOME}) + set(ORACLE_HOME ${CMAKE_ORACLE_DIR}) find_path(ORACLE_INCLUDE_DIR NAMES oci.h PATHS - /usr/include/oracle/18.3/client - /usr/include/oracle/21/client64 + ${CMAKE_ORACLE_INCLUDE_DIR} ${ORACLE_HOME}/rdbms/public ${ORACLE_HOME}/include ${ORACLE_HOME}/sdk/include # Oracle SDK