You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by is...@apache.org on 2018/04/05 14:39:44 UTC
ignite git commit: IGNITE-8150: Fix
Repository: ignite
Updated Branches:
refs/heads/ignite-8150 [created] 981c59173
IGNITE-8150: Fix
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/981c5917
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/981c5917
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/981c5917
Branch: refs/heads/ignite-8150
Commit: 981c5917372b15b2b4607e540de4b8c027dd5110
Parents: 635e9a6
Author: Igor Sapego <is...@gridgain.com>
Authored: Thu Apr 5 17:31:32 2018 +0300
Committer: Igor Sapego <is...@gridgain.com>
Committed: Thu Apr 5 17:31:32 2018 +0300
----------------------------------------------------------------------
modules/platforms/cpp/odbc/project/vs/odbc.vcxproj | 4 ++--
modules/platforms/cpp/odbc/src/ssl/ssl_gateway.cpp | 8 +++++++-
2 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/981c5917/modules/platforms/cpp/odbc/project/vs/odbc.vcxproj
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/odbc/project/vs/odbc.vcxproj b/modules/platforms/cpp/odbc/project/vs/odbc.vcxproj
index 4f7c16e..374695b 100644
--- a/modules/platforms/cpp/odbc/project/vs/odbc.vcxproj
+++ b/modules/platforms/cpp/odbc/project/vs/odbc.vcxproj
@@ -93,7 +93,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<SDLCheck>false</SDLCheck>
- <AdditionalIncludeDirectories>$(OPENSSL_HOME)\include;$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\..\binary\include;$(ProjectDir)\..\..\..\binary\os\win\include;$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\os\win\include;$(ProjectDir)\..\..\src</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(OPENSSL_HOME_X86)\include;$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\..\binary\include;$(ProjectDir)\..\..\..\binary\os\win\include;$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\os\win\include;$(ProjectDir)\..\..\src</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;IGNITE_FRIEND;TARGET_MODULE_FULL_NAME="$(TargetFileName)";_DEBUG;ODBC_DEBUG;ODBC_LOG_PATH="D:\\odbc.log";%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
@@ -128,7 +128,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>$(OPENSSL_HOME)\include;$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\..\binary\include;$(ProjectDir)\..\..\..\binary\os\win\include;$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\os\win\include;$(ProjectDir)\..\..\src</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(OPENSSL_HOME_X86)\include;$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\..\binary\include;$(ProjectDir)\..\..\..\binary\os\win\include;$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\os\win\include;$(ProjectDir)\..\..\src</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;IGNITE_FRIEND;TARGET_MODULE_FULL_NAME="$(TargetFileName)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BufferSecurityCheck>false</BufferSecurityCheck>
</ClCompile>
http://git-wip-us.apache.org/repos/asf/ignite/blob/981c5917/modules/platforms/cpp/odbc/src/ssl/ssl_gateway.cpp
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/odbc/src/ssl/ssl_gateway.cpp b/modules/platforms/cpp/odbc/src/ssl/ssl_gateway.cpp
index c91d44e..0fd7930 100644
--- a/modules/platforms/cpp/odbc/src/ssl/ssl_gateway.cpp
+++ b/modules/platforms/cpp/odbc/src/ssl/ssl_gateway.cpp
@@ -25,6 +25,10 @@
#include "ignite/odbc/ssl/ssl_gateway.h"
#include "ignite/odbc/log.h"
+#ifndef ADDITIONAL_OPENSSL_HOME_ENV
+# define ADDITIONAL_OPENSSL_HOME_ENV "OPEN_SSL_HOME"
+#endif // ADDITIONAL_OPENSSL_HOME_ENV
+
namespace ignite
{
namespace odbc
@@ -55,7 +59,9 @@ namespace ignite
if (libModule.IsLoaded())
return libModule;
- std::string home = GetEnv("OPEN_SSL_HOME");
+ std::string home = GetEnv(ADDITIONAL_OPENSSL_HOME_ENV);
+
+ std::cout << ADDITIONAL_OPENSSL_HOME_ENV << std::endl;
if (home.empty())
home = GetEnv("OPENSSL_HOME");