From effad6e91c4a8d0a8e1f12ba72f99a85432e8c5c Mon Sep 17 00:00:00 2001 From: Jacob Barthelmeh Date: Fri, 6 Oct 2017 09:05:56 -0600 Subject: [PATCH] clean up include paths for MySQL cmake build --- IDE/MYSQL/CMakeLists_wolfCrypt.txt | 6 +++--- IDE/MYSQL/CMakeLists_wolfSSL.txt | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/IDE/MYSQL/CMakeLists_wolfCrypt.txt b/IDE/MYSQL/CMakeLists_wolfCrypt.txt index ed368747b..f03a707ec 100644 --- a/IDE/MYSQL/CMakeLists_wolfCrypt.txt +++ b/IDE/MYSQL/CMakeLists_wolfCrypt.txt @@ -18,10 +18,10 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/extra/wolfssl/wolfcrypt - ${CMAKE_SOURCE_DIR}/extra/wolfssl) +INCLUDE_DIRECTORIES( + ${CMAKE_SOURCE_DIR}/include + ${CMAKE_SOURCE_DIR}/extra/wolfssl) -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) ADD_DEFINITIONS(${SSL_DEFINES}) SET(WOLFCRYPT_SOURCES src/aes.c src/arc4.c src/asn.c src/blake2b.c src/camellia.c src/chacha.c src/coding.c src/compress.c src/des3.c diff --git a/IDE/MYSQL/CMakeLists_wolfSSL.txt b/IDE/MYSQL/CMakeLists_wolfSSL.txt index 0fde07faf..a786efc48 100644 --- a/IDE/MYSQL/CMakeLists_wolfSSL.txt +++ b/IDE/MYSQL/CMakeLists_wolfSSL.txt @@ -21,8 +21,8 @@ INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/extra/wolfssl - ${CMAKE_SOURCE_DIR}/extra/wolfssl/wolfssl - ${CMAKE_SOURCE_DIR}/extra/wolfssl/wolfssl/wolfcrypt) + ${CMAKE_SOURCE_DIR}/extra/wolfssl/wolfssl) + ADD_DEFINITIONS(${SSL_DEFINES})