summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorElena Stepanova <elenst@wheezy-64.home>2014-04-03 21:58:56 +0400
committerElena Stepanova <elenst@wheezy-64.home>2014-04-03 21:58:56 +0400
commit0566c34afd43477b044f0d6c943ffe1175cc2cd7 (patch)
treefb3607a6fad557351670b52a0713e44c3c604a3f /cmake
parentcb67dcb6184535349ca4ff3d7c64eba9c63a0688 (diff)
downloadmariadb-git-0566c34afd43477b044f0d6c943ffe1175cc2cd7.tar.gz
MDEV-6016 Packaging error with cmake 2.8.12 and greater
Avoid CPack complaints when a pdb file is missing for a static library (patch from Vladislav Vaintroub)
Diffstat (limited to 'cmake')
-rw-r--r--cmake/install_macros.cmake6
1 files changed, 5 insertions, 1 deletions
diff --git a/cmake/install_macros.cmake b/cmake/install_macros.cmake
index 7feba109296..877c493445d 100644
--- a/cmake/install_macros.cmake
+++ b/cmake/install_macros.cmake
@@ -60,7 +60,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()