Skip to content

Commit

Permalink
Small build changes for GitHub
Browse files Browse the repository at this point in the history
  • Loading branch information
bigfug committed Mar 3, 2024
1 parent 6bea244 commit 32540dd
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ install( DIRECTORY share/ DESTINATION ${PATH_SHARE}

#------------------------------------------------------------------------------

set( OPENSSL_ROOT_DIR "" CACHE PATH "Path to OpenSSL" )
set( OPENSSL_ROOT_DIR "C:/Program Files/OpenSSL" CACHE PATH "Path to OpenSSL" )

find_package( OpenSSL )

Expand Down
6 changes: 2 additions & 4 deletions cmake/DeployApp.cmake
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@

find_package(Qt6 COMPONENTS Core Core5Compat Concurrent Gui OpenGL Network Widgets
OPTIONAL_COMPONENTS SerialPort WebSockets QuickWidgets QuickControls2 Quick Qml LinguistTools

QUIET
)

if (Qt6_FOUND)
target_link_libraries( ${PROJECT_NAME} PUBLIC Qt6::Core5Compat)
else()
if (NOT Qt6_FOUND)
find_package(Qt5 5.15 REQUIRED COMPONENTS Core Concurrent Gui OpenGL Network Widgets
OPTIONAL_COMPONENTS SerialPort WebSockets QuickWidgets QuickControls2 Quick Qml LinguistTools
QUIET
Expand Down

0 comments on commit 32540dd

Please sign in to comment.