Skip to content

MacOS QT Permissions Fix #505

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Gin890 merged 1 commit into from
Nov 14, 2024
Merged

MacOS QT Permissions Fix #505

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions SerialPrograms/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2056,8 +2056,8 @@ else() # WIN and Linux:
endif()

set_target_properties(SerialPrograms PROPERTIES LINKER_LANGUAGE CXX)
target_link_libraries(SerialPrograms Qt${QT_MAJOR}::Widgets Qt${QT_MAJOR}::SerialPort Qt${QT_MAJOR}::Multimedia Qt${QT_MAJOR}::MultimediaWidgets)
target_link_libraries(SerialPrograms Threads::Threads)
target_link_libraries(SerialPrograms PRIVATE Qt${QT_MAJOR}::Widgets Qt${QT_MAJOR}::SerialPort Qt${QT_MAJOR}::Multimedia Qt${QT_MAJOR}::MultimediaWidgets)
target_link_libraries(SerialPrograms PRIVATE Threads::Threads)

#add defines
target_compile_definitions(SerialPrograms PRIVATE NOMINMAX)
Expand Down Expand Up @@ -2107,7 +2107,7 @@ if (MSVC)
MAP_IMPORTED_CONFIG_MINSIZEREL RELEASE
)

target_link_libraries(SerialPrograms tesseractPA.lib OpenCV_lib Sleepy.lib dpp_lib)
target_link_libraries(SerialPrograms PRIVATE tesseractPA.lib OpenCV_lib Sleepy.lib dpp_lib)
target_compile_definitions(SerialPrograms PRIVATE PA_TESSERACT PA_SLEEPY PA_DPP _CRT_SECURE_NO_WARNINGS)

target_compile_options(SerialPrograms PRIVATE /FAs /FaAssembly/ /MP /W4 /WX /utf-8)
Expand Down Expand Up @@ -2137,7 +2137,7 @@ else()
# pkg_search_module(OPENCV REQUIRED opencv)
include_directories(${OpenCV_INCLUDE_DIRS})
link_directories(${OpenCV_LIBRARY_DIRS})
target_link_libraries(SerialPrograms ${OpenCV_LIBS})
target_link_libraries(SerialPrograms PRIVATE ${OpenCV_LIBS})

#we hope to use our own Tesseract build in future so we can rid that dependency
#but right now to run on Linux and Mac we need to use external Tesseract library
Expand All @@ -2150,8 +2150,8 @@ else()
include_directories(${LEPTONICA_INCLUDE_DIRS})
link_directories(${TESSERACT_LIBRARY_DIRS})
link_directories(${LEPTONICA_LIBRARY_DIRS})
target_link_libraries(SerialPrograms ${TESSERACT_LINK_LIBRARIES})
target_link_libraries(SerialPrograms ${LEPTONICA_LINK_LIBRARIES})
target_link_libraries(SerialPrograms PRIVATE ${TESSERACT_LINK_LIBRARIES})
target_link_libraries(SerialPrograms PRIVATE ${LEPTONICA_LINK_LIBRARIES})
endif()

# enable dpp integration
Expand All @@ -2162,7 +2162,7 @@ else()
INTERFACE_COMPILE_DEFINITIONS "PA_DPP"
INTERFACE_LINK_LIBRARIES "-L/opt/homebrew/lib -lssl -lcrypto -lopus -lsodium -lz" # add dpp's deps
)
target_link_libraries(SerialPrograms libdpp)
target_link_libraries(SerialPrograms PRIVATE libdpp)
endif()

# Add -Wno-c11-extensions to avoid clang gives
Expand All @@ -2174,7 +2174,7 @@ else()
if (WIN32)
elseif (APPLE)
# on macOS, need this framework to query OS API to control display sleep and system sleep behavior
target_link_libraries(SerialPrograms "-framework IOKit -framework CoreFoundation")
target_link_libraries(SerialPrograms PRIVATE "-framework IOKit -framework CoreFoundation")
elseif(UNIX)
endif()

Expand Down Expand Up @@ -2271,3 +2271,5 @@ file(GLOB MY_DLLS
)
file(COPY ${MY_DLLS} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
endif()

qt_finalize_target(SerialPrograms)
Loading