diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-05-21 11:09:55 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-05-21 11:09:55 -0400 |
| commit | 086af8367ed2499adae378638225ceb14c85f046 (patch) | |
| tree | 953720d86a4decd67a24b560ffbe277900ff9609 /cmake/install_macros.cmake | |
| parent | 558995ad84ca1348dfe681a8d111650225fcc205 (diff) | |
| parent | 1170a54060168d885cbf682836342d4fc4ccae1a (diff) | |
| download | mariadb-git-086af8367ed2499adae378638225ceb14c85f046.tar.gz | |
bzr merge -r4209 maria/10.0.
Diffstat (limited to 'cmake/install_macros.cmake')
| -rw-r--r-- | cmake/install_macros.cmake | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/cmake/install_macros.cmake b/cmake/install_macros.cmake index 0b20435dbaf..6cb5b02ecec 100644 --- a/cmake/install_macros.cmake +++ b/cmake/install_macros.cmake @@ -85,7 +85,11 @@ FUNCTION (INSTALL_DEBUG_SYMBOLS) IF(NOT comp) SET(comp Debuginfo_archive_only) # not in MSI ENDIF() - INSTALL(FILES ${pdb_location} DESTINATION ${ARG_INSTALL_LOCATION} COMPONENT ${comp}) + IF(type MATCHES "STATIC") + # PDB for static libraries might be unsupported http://public.kitware.com/Bug/view.php?id=14600 + SET(opt OPTIONAL) + ENDIF() + INSTALL(FILES ${pdb_location} DESTINATION ${ARG_INSTALL_LOCATION} COMPONENT ${comp} ${opt}) ENDFOREACH() ENDIF() ENDFUNCTION() @@ -410,19 +414,21 @@ FUNCTION(INSTALL_MYSQL_TEST from to) DESTINATION "${INSTALL_MYSQLTESTDIR}/${to}" USE_SOURCE_PERMISSIONS COMPONENT Test - PATTERN "var/" EXCLUDE + PATTERN "var" EXCLUDE PATTERN "lib/My/SafeProcess" EXCLUDE PATTERN "lib/t*" EXCLUDE PATTERN "CPack" EXCLUDE PATTERN "CMake*" EXCLUDE + PATTERN "cmake_install.cmake" EXCLUDE PATTERN "mtr.out*" EXCLUDE PATTERN ".cvsignore" EXCLUDE PATTERN "*.am" EXCLUDE PATTERN "*.in" EXCLUDE + PATTERN "Makefile" EXCLUDE PATTERN "*.vcxproj" EXCLUDE PATTERN "*.vcxproj.filters" EXCLUDE PATTERN "*.vcxproj.user" EXCLUDE - PATTERN "CTest" EXCLUDE + PATTERN "CTest*" EXCLUDE PATTERN "*~" EXCLUDE ) ENDIF() |