diff options
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | cmake/modules/FindSparkle.cmake | 15 | ||||
| -rwxr-xr-x | packaging/macosx/osx-app.sh.in | 2 |
3 files changed, 15 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 959dee687d..2d0d24f2e0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2271,7 +2271,7 @@ if(BUILD_wireshark AND QT_FOUND) ${APPLE_APPKIT_LIBRARY} ${APPLE_CORE_FOUNDATION_LIBRARY} ${APPLE_SYSTEM_CONFIGURATION_LIBRARY} - ${SPARKLE_LIBRARY} + ${SPARKLE_LIBRARIES} ${WIN_WS2_32_LIBRARY} ${WIN_VERSION_LIBRARY} ${WINSPARKLE_LIBRARIES} @@ -2318,7 +2318,7 @@ if(BUILD_wireshark AND QT_FOUND) endif() target_link_libraries(wireshark ${wireshark_LIBS}) - target_include_directories(wireshark SYSTEM PRIVATE ${SPARKLE_INCLUDE_DIR}) + target_include_directories(wireshark SYSTEM PRIVATE ${SPARKLE_INCLUDE_DIRS}) install( TARGETS wireshark diff --git a/cmake/modules/FindSparkle.cmake b/cmake/modules/FindSparkle.cmake index 7da80be0ea..5c14080d08 100644 --- a/cmake/modules/FindSparkle.cmake +++ b/cmake/modules/FindSparkle.cmake @@ -2,9 +2,9 @@ # Find the Sparkle framework # # This defines the following: -# SPARKLE_FOUND - True if we found Sparkle -# SPARKLE_INCLUDE_DIR - Path to Sparkle.h -# SPARKLE_LIBRARY - Path to Sparkle.framework +# SPARKLE_FOUND - True if we found Sparkle +# SPARKLE_INCLUDE_DIRS - Path to Sparkle.h, empty if not found +# SPARKLE_LIBRARIES - Path to Sparkle.framework, empty if not found include(FindPackageHandleStandardArgs) @@ -19,4 +19,13 @@ find_library(SPARKLE_LIBRARY NAMES Sparkle ) find_package_handle_standard_args(Sparkle DEFAULT_MSG SPARKLE_INCLUDE_DIR SPARKLE_LIBRARY) + +if(SPARKLE_FOUND) + set(SPARKLE_LIBRARIES ${SPARKLE_LIBRARY} ) + set(SPARKLE_INCLUDE_DIRS ${SPARKLE_INCLUDE_DIR} ) +else(SPARKLE_FOUND) + set(SPARKLE_LIBRARIES ) + set(SPARKLE_INCLUDE_DIRS ) +endif(SPARKLE_FOUND) + mark_as_advanced(SPARKLE_INCLUDE_DIR SPARKLE_LIBRARY) 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. |