diff --git a/CMakeLists.txt b/CMakeLists.txt
index 902438561..b6996c1f0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,6 +25,10 @@ if(SERVER_BUILD_DIR)
     set(CMAKE_BUILD_TYPE ${SERVER_CMAKE_BUILD_TYPE} CACHE STRING "Build configuration type" FORCE)
 endif()
 
+SET_PROPERTY(DIRECTORY PROPERTY EP_BASE ${CMAKE_CURRENT_BINARY_DIR}/external)
+LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake)
+
+INCLUDE(check_compiler_flag)
 INCLUDE(ExternalProject)
 INCLUDE(CheckCXXSourceCompiles)
 
@@ -104,9 +108,6 @@ ELSE ()
     ENDIF ()
 ENDIF ()
 
-SET_PROPERTY(DIRECTORY PROPERTY EP_BASE ${CMAKE_CURRENT_BINARY_DIR}/external)
-LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake)
-
 SET (ENGINE_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 
 INCLUDE(columnstore_version)
@@ -184,8 +185,6 @@ ELSE()
 ENDIF()
 
 IF (NOT INSTALL_LAYOUT)
-    INCLUDE(check_compiler_flag)
-
     MY_CHECK_AND_SET_COMPILER_FLAG("-g -O3 -fno-omit-frame-pointer -fno-strict-aliasing -Wall -fno-tree-vectorize -D_GLIBCXX_ASSERTIONS -DDBUG_OFF -DHAVE_CONFIG_H" RELEASE RELWITHDEBINFO MINSIZEREL)
     MY_CHECK_AND_SET_COMPILER_FLAG("-ggdb3 -fno-omit-frame-pointer -fno-tree-vectorize -D_GLIBCXX_ASSERTIONS -DSAFE_MUTEX -DSAFEMALLOC -DENABLED_DEBUG_SYNC -O0 -Wall -D_DEBUG -DHAVE_CONFIG_H" DEBUG)
     MY_CHECK_AND_SET_COMPILER_FLAG("-msse4.2" RELEASE RELWITHDEBINFO MINSIZEREL DEBUG)
diff --git a/dbcon/mysql/CMakeLists.txt b/dbcon/mysql/CMakeLists.txt
index d09a3c34e..6741e96b0 100644
--- a/dbcon/mysql/CMakeLists.txt
+++ b/dbcon/mysql/CMakeLists.txt
@@ -6,7 +6,7 @@ include_directories( ${ENGINE_COMMON_INCLUDES}
                      ${SERVER_SOURCE_ROOT_DIR}/storage/maria )
 
 SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../../../)
-SET(S3API_DEPS marias3 curl CACHE INTERNAL "S3API_DEPS")
+SET(S3API_DEPS marias3 CACHE INTERNAL "S3API_DEPS")
 
 
 SET ( libcalmysql_SRCS