fix for mac

This commit is contained in:
Daniel Larimer 2014-06-03 11:16:29 -04:00
parent 5a0f996333
commit 73dd2d68ea
2 changed files with 12 additions and 9 deletions

View file

@ -312,8 +312,10 @@ ELSE()
SET (OPENSSL_CONF_TARGET ${CMAKE_CURRENT_BINARY_DIR})
ENDIF()
IF(WIN32)
SET(POST_BUILD_STEP_COMMANDS ${POST_BUILD_STEP_COMMANDS}
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${OPENSSL_ROOT_DIR}/ssl/openssl.cnf" "${OPENSSL_CONF_TARGET}/openssl.cnf")
ENDIF(WIN32)
ADD_CUSTOM_COMMAND(TARGET fc POST_BUILD ${POST_BUILD_STEP_COMMANDS}
COMMENT "Copying OpenSSL/ssl/openssl.cnf into target directory."

View file

@ -6,6 +6,7 @@
#include <cstdlib>
#include <string>
#include <stdlib.h>
namespace fc
{
@ -22,7 +23,7 @@ namespace fc
{
std::string varSetting("OPENSSL_CONF=");
varSetting += _configurationFilePath.to_native_ansi_path();
putenv(varSetting.c_str());
putenv((char*)varSetting.c_str());
}
OPENSSL_config(nullptr);