generated from actions/typescript-action
-
-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into mysql8.4.0-is-released
- Loading branch information
Showing
5 changed files
with
354 additions
and
212 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,78 @@ | ||
diff --git a/cmake/install_macros.cmake b/cmake/install_macros.cmake | ||
index 859715a45c4..3d5c8064531 100644 | ||
--- a/cmake/install_macros.cmake | ||
+++ b/cmake/install_macros.cmake | ||
@@ -22,33 +22,8 @@ | ||
|
||
# For windows: install .pdb file for each target. | ||
MACRO(INSTALL_DEBUG_SYMBOLS target) | ||
- IF(MSVC) | ||
- GET_TARGET_PROPERTY(type ${target} TYPE) | ||
- IF(NOT INSTALL_LOCATION) | ||
- IF(type MATCHES "STATIC_LIBRARY" | ||
- OR type MATCHES "MODULE_LIBRARY" | ||
- OR type MATCHES "SHARED_LIBRARY") | ||
- SET(INSTALL_LOCATION "lib") | ||
- ELSEIF(type MATCHES "EXECUTABLE") | ||
- SET(INSTALL_LOCATION "bin") | ||
- ELSE() | ||
- MESSAGE(FATAL_ERROR | ||
- "cannot determine type of ${target}. Don't now where to install") | ||
- ENDIF() | ||
- ENDIF() | ||
- | ||
- IF(target STREQUAL "mysqld" OR target STREQUAL "mysqlbackup") | ||
- SET(comp Server) | ||
- ELSE() | ||
- SET(comp Debuginfo) | ||
- ENDIF() | ||
- | ||
- # No .pdb file for static libraries. | ||
- IF(NOT type MATCHES "STATIC_LIBRARY") | ||
- INSTALL(FILES $<TARGET_PDB_FILE:${target}> | ||
- DESTINATION ${INSTALL_LOCATION} COMPONENT ${comp}) | ||
- ENDIF() | ||
- ENDIF() | ||
+# .pdb files are too large to use in GitHub Actions. | ||
+# so skip installing | ||
ENDMACRO() | ||
|
||
|
||
@@ -274,23 +249,6 @@ FUNCTION(INSTALL_DEBUG_TARGET target) | ||
ENDIF() | ||
ENDIF() | ||
|
||
- # For windows, install .pdb files for .exe and .dll files. | ||
- IF(MSVC AND NOT target_type STREQUAL "STATIC_LIBRARY") | ||
- GET_FILENAME_COMPONENT(ext ${debug_target_location} EXT) | ||
- STRING(REPLACE "${ext}" ".pdb" | ||
- debug_pdb_target_location "${debug_target_location}" ) | ||
- IF (RENAME_PARAM) | ||
- STRING(REPLACE "${ext}" ".pdb" pdb_rename "${ARG_RENAME}") | ||
- SET(PDB_RENAME_PARAM RENAME "${pdb_rename}") | ||
- ENDIF() | ||
- | ||
- INSTALL(FILES ${debug_pdb_target_location} | ||
- DESTINATION ${ARG_DESTINATION} | ||
- ${PDB_RENAME_PARAM} | ||
- CONFIGURATIONS Release RelWithDebInfo | ||
- COMPONENT ${ARG_COMPONENT} | ||
- OPTIONAL) | ||
- ENDIF() | ||
ENDFUNCTION() | ||
|
||
|
||
diff --git a/router/cmake/Plugin.cmake b/router/cmake/Plugin.cmake | ||
index 30ba9fa7eaf..4b49751a124 100644 | ||
--- a/router/cmake/Plugin.cmake | ||
+++ b/router/cmake/Plugin.cmake | ||
@@ -150,9 +150,6 @@ FUNCTION(add_harness_plugin NAME) | ||
INSTALL(TARGETS ${NAME} | ||
RUNTIME DESTINATION ${_option_DESTINATION} | ||
COMPONENT Router) | ||
- INSTALL(FILES $<TARGET_PDB_FILE:${NAME}> | ||
- DESTINATION ${_option_DESTINATION} | ||
- COMPONENT Router) | ||
ELSE() | ||
INSTALL(TARGETS ${NAME} | ||
LIBRARY DESTINATION ${_option_DESTINATION} |
Oops, something went wrong.