diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-08-02 11:44:02 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-08-02 11:44:02 +0300 |
| commit | c5a8583b3146613429d88c1c044de88a4c4c94b0 (patch) | |
| tree | fe8c0476ae87e918655483aa1b417189c938780c /cmake | |
| parent | c863159c320008676aff978a7cdde5732678f975 (diff) | |
| parent | e023f9a4d5a620b54d7f7132567150d80b630692 (diff) | |
| download | mariadb-git-c5a8583b3146613429d88c1c044de88a4c4c94b0.tar.gz | |
Merge tag 'mariadb-10.0.36' into 10.0-galera
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/install_macros.cmake | 8 | ||||
| -rw-r--r-- | cmake/mysql_add_executable.cmake | 3 | ||||
| -rw-r--r-- | cmake/os/Windows.cmake | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/cmake/install_macros.cmake b/cmake/install_macros.cmake index 0d3e0607cf7..4305c8daf73 100644 --- a/cmake/install_macros.cmake +++ b/cmake/install_macros.cmake @@ -140,6 +140,10 @@ FUNCTION(INSTALL_SCRIPT) SET(COMP) ENDIF() + IF (COMP MATCHES ${SKIP_COMPONENTS}) + RETURN() + ENDIF() + INSTALL(FILES ${script} DESTINATION ${ARG_DESTINATION} @@ -163,6 +167,10 @@ FUNCTION(INSTALL_DOCUMENTATION) SET(destination ${INSTALL_DOCDIR}) ENDIF() + IF (ARG_COMPONENT MATCHES ${SKIP_COMPONENTS}) + RETURN() + ENDIF() + STRING(TOUPPER ${ARG_COMPONENT} COMPUP) IF(CPACK_COMPONENT_${COMPUP}_GROUP) SET(group ${CPACK_COMPONENT_${COMPUP}_GROUP}) diff --git a/cmake/mysql_add_executable.cmake b/cmake/mysql_add_executable.cmake index 45575bdd536..c8a2e522d66 100644 --- a/cmake/mysql_add_executable.cmake +++ b/cmake/mysql_add_executable.cmake @@ -59,6 +59,9 @@ FUNCTION (MYSQL_ADD_EXECUTABLE) ELSE() SET(COMP COMPONENT Client) ENDIF() + IF (COMP MATCHES ${SKIP_COMPONENTS}) + RETURN() + ENDIF() MYSQL_INSTALL_TARGETS(${target} DESTINATION ${ARG_DESTINATION} ${COMP}) ENDIF() ENDFUNCTION() diff --git a/cmake/os/Windows.cmake b/cmake/os/Windows.cmake index e4221227d91..b69ae9bebf8 100644 --- a/cmake/os/Windows.cmake +++ b/cmake/os/Windows.cmake @@ -51,7 +51,7 @@ IF(CMAKE_C_COMPILER MATCHES "icl") ENDIF() ADD_DEFINITIONS(-D_WINDOWS -D__WIN__ -D_CRT_SECURE_NO_DEPRECATE) -ADD_DEFINITIONS(-D_WIN32_WINNT=0x0501) +ADD_DEFINITIONS(-D_WIN32_WINNT=0x0A00) # We do not want the windows.h macros min/max ADD_DEFINITIONS(-DNOMINMAX) # Speed up build process excluding unused header files |