diff options
| author | Jonathan Perkin <jonathan.perkin@oracle.com> | 2010-07-05 19:54:07 +0100 |
|---|---|---|
| committer | Jonathan Perkin <jonathan.perkin@oracle.com> | 2010-07-05 19:54:07 +0100 |
| commit | 2a64ad9a5a1d4e0f3e38ead39daf4fc9d8bbaf4e (patch) | |
| tree | 3e8e6efeead5b3a38a105055da1c4b2d9c2a577e | |
| parent | 28593b44d6224da376fe55f025ec0ac803b71b53 (diff) | |
| download | mariadb-git-2a64ad9a5a1d4e0f3e38ead39daf4fc9d8bbaf4e.tar.gz | |
I'm pretty sure 'CXX_FLAGS' is a typo for 'CMAKE_CXX_FLAGS', and
this is the reason why -fno-implicit-templates is removed from the
entire build when sourcing this file, rather than just limited to
yassl sources.
| -rw-r--r-- | cmake/ssl.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake index d1f48888092..c5aa2de2721 100644 --- a/cmake/ssl.cmake +++ b/cmake/ssl.cmake @@ -29,14 +29,14 @@ MACRO (MYSQL_USE_BUNDLED_SSL) CHANGE_SSL_SETTINGS("bundled") #Remove -fno-implicit-templates #(yassl sources cannot be compiled with it) - SET(SAVE_CXX_FLAGS ${CXX_FLAGS}) + SET(SAVE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) IF(CMAKE_CXX_FLAGS) STRING(REPLACE "-fno-implicit-templates" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) ENDIF() ADD_SUBDIRECTORY(extra/yassl) ADD_SUBDIRECTORY(extra/yassl/taocrypt) - SET(CXX_FLAGS ${SAVE_CXX_FLAGS}) + SET(CMAKE_CXX_FLAGS ${SAVE_CXX_FLAGS}) GET_TARGET_PROPERTY(src yassl SOURCES) FOREACH(file ${src}) SET(SSL_SOURCES ${SSL_SOURCES} ${CMAKE_SOURCE_DIR}/extra/yassl/${file}) |