diff options
Diffstat (limited to 'cmake/platform')
| -rw-r--r-- | cmake/platform/unix/settings.cmake | 2 | ||||
| -rw-r--r-- | cmake/platform/win/settings.cmake | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/cmake/platform/unix/settings.cmake b/cmake/platform/unix/settings.cmake index b0c0d260623..42bfefa6994 100644 --- a/cmake/platform/unix/settings.cmake +++ b/cmake/platform/unix/settings.cmake @@ -33,7 +33,7 @@ add_custom_target(uninstall message(STATUS "UNIX: Created uninstall target") message(STATUS "UNIX: Detected compiler: ${CMAKE_C_COMPILER}") -if(CMAKE_C_COMPILER MATCHES "gcc") +if(CMAKE_C_COMPILER MATCHES "gcc" OR CMAKE_C_COMPILER_ID STREQUAL "GNU") include(${CMAKE_SOURCE_DIR}/cmake/compiler/gcc/settings.cmake) elseif(CMAKE_C_COMPILER MATCHES "icc") include(${CMAKE_SOURCE_DIR}/cmake/compiler/icc/settings.cmake) diff --git a/cmake/platform/win/settings.cmake b/cmake/platform/win/settings.cmake index c0f724922e3..f57f84c6a45 100644 --- a/cmake/platform/win/settings.cmake +++ b/cmake/platform/win/settings.cmake @@ -2,8 +2,6 @@ option(USE_MYSQL_SOURCES "Use included MySQL-sources to build libraries" 1) # Package overloads -set(ACE_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/dep/acelite) -set(ACE_LIBRARY "ace") set(BZIP2_LIBRARIES "bzip2") set(ZLIB_LIBRARIES "zlib") |