26 lines
1.2 KiB
Diff
26 lines
1.2 KiB
Diff
|
--- CMakeLists.txt.old 2023-11-12 12:28:49.000000000 +0100
|
||
|
+++ CMakeLists.txt 2023-11-16 17:08:59.841823856 +0100
|
||
|
@@ -353,9 +353,6 @@
|
||
|
cmake_policy(SET CMP0026 OLD) # https://cmake.org/cmake/help/v3.0/policy/CMP0026.html
|
||
|
endif()
|
||
|
|
||
|
-# OpenSSL
|
||
|
-include(FindOpenSSL)
|
||
|
-
|
||
|
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
|
||
|
message(STATUS "install " ${CMAKE_BINARY_DIR} " to " ${CMAKE_INSTALL_PREFIX}/bin)
|
||
|
install(TARGETS ${COMPANION_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
|
||
|
@@ -379,12 +376,6 @@
|
||
|
install(FILES ../targets/linux/45-companion-taranis.rules DESTINATION ${INSTALL_TEMP_LIB_PFX}lib/udev/rules.d RENAME 45-companion${C9X_NAME_SUFFIX}-taranis.rules)
|
||
|
install(FILES ../targets/linux/45-usbasp.rules DESTINATION ${INSTALL_TEMP_LIB_PFX}lib/udev/rules.d RENAME 45-companion${C9X_NAME_SUFFIX}-usbasp.rules)
|
||
|
|
||
|
- if (OPENSSL_FOUND)
|
||
|
- get_filename_component(OPENSSL_SSL_LIBRARY_DIR ${OPENSSL_SSL_LIBRARY} DIRECTORY)
|
||
|
- # install only files Qt networking requires
|
||
|
- install(DIRECTORY ${OPENSSL_SSL_LIBRARY_DIR}/ DESTINATION ${CMAKE_INSTALL_PREFIX}/lib FILES_MATCHING PATTERN "engines*" EXCLUDE PATTERN "pkg*" EXCLUDE PATTERN "*.so*")
|
||
|
- endif()
|
||
|
-
|
||
|
# Linux specific code
|
||
|
set(OperatingSystem "Linux")
|
||
|
# Shortcut target
|