diff options
author | Gerald Combs <gerald@wireshark.org> | 2019-11-15 13:30:19 -0800 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2019-11-15 22:34:06 +0000 |
commit | 7cc5f4c45f9792f2cd3d207efed48aa021bdffd4 (patch) | |
tree | d3250465db3a3b75708859f313acbcfa9aecd63a /packaging | |
parent | e624545b957ad3b6780088e37ddda872e1b23735 (diff) |
CMake: Work correctly without Sparkle.
Set or clear SPARKLE_LIBRARIES and SPARKLE_INCLUDE_DIRS in
FindSparkle.cmake, similar to what we do in other modules. Use them
instead of SPARKLE_LIBRARY and SPARKLE_INCLUDE_DIR.
Change-Id: I023c711edd6a44421aadf85413da3207d9b08e64
Reviewed-on: https://code.wireshark.org/review/35097
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'packaging')
-rwxr-xr-x | packaging/macosx/osx-app.sh.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packaging/macosx/osx-app.sh.in b/packaging/macosx/osx-app.sh.in index f3fb8f2f2a..152e4d6c4d 100755 --- a/packaging/macosx/osx-app.sh.in +++ b/packaging/macosx/osx-app.sh.in @@ -114,7 +114,7 @@ if [ ! -d "$qt_frameworks_dir" ] ; then exit 1 fi -sparkle_frameworks_dir="@SPARKLE_LIBRARY@" +sparkle_frameworks_dir="@SPARKLE_LIBRARIES@" # # Leave the Qt frameworks out of the special processing. |