aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2019-12-10 15:43:29 -0800
committerAnders Broman <a.broman58@gmail.com>2019-12-11 04:55:43 +0000
commit3e0acea60488ac51ff9f181266b7e4f5928248d3 (patch)
tree2821f4a59303874807df126359cc7f69a02e6e04
parent2db8ca2671074be06726cb3aeb41ff849004d3f9 (diff)
CMake: Fixup a variable in FindLZ4.cmake
Set "LZ4_PDB" instead of "LZ4_pdb" in FindLZ4.cmake so that CMake 3.16 will convert "${LZ4_DLL_DIR}/${LZ4_PDB}" to the full path to the LZ4 .pdb instead of its parent directory. This in turn ensures that we don't pass a directory as a source argument to `cmake -E copy_if_different`, which causes it to crash. Bug: 16271 Change-Id: Id6f37584379bd07bc929bc5cb5e80cbe60a3c77e Reviewed-on: https://code.wireshark.org/review/35400 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
-rw-r--r--cmake/modules/FindLZ4.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/modules/FindLZ4.cmake b/cmake/modules/FindLZ4.cmake
index dcf727fe08..30ce491894 100644
--- a/cmake/modules/FindLZ4.cmake
+++ b/cmake/modules/FindLZ4.cmake
@@ -61,7 +61,7 @@ if( LZ4_FOUND )
file( GLOB _lz4_pdb RELATIVE "${LZ4_DLL_DIR}"
"${LZ4_DLL_DIR}/lz4*.pdb"
)
- set ( LZ4_pdb ${_lz4_pdb}
+ set ( LZ4_PDB ${_lz4_pdb}
CACHE FILEPATH "LZ4 PDB file name"
)
mark_as_advanced( LZ4_DLL_DIR LZ4_DLL LZ4_PDB )