Test
Some checks failed
Raspberry Pi 4 Build / Explore-Gitea-Actions (push) Failing after 1m29s

This commit is contained in:
Arron David Nelson 2024-01-31 13:55:57 -08:00
parent af4db4910e
commit cce6e2125b

View File

@ -229,7 +229,7 @@ add_executable(StrToHash src/StrToHash.cpp)
message("Project Dir: ${PROJECT_SOURCE_DIR}") message("Project Dir: ${PROJECT_SOURCE_DIR}")
target_include_directories(EHS PUBLIC ${PROJECT_SOURCE_DIR}/include) target_include_directories(EHS PUBLIC ${PROJECT_SOURCE_DIR}/include)
target_include_directories(StrToHash PUBLIC ${PROJECT_SOURCE_DIR}/include) #target_include_directories(StrToHash PUBLIC ${PROJECT_SOURCE_DIR}/include)
set(CMAKE_INSTALL_PREFIX "${USER_HOME_DIRECTORY}/Libraries/EHS") set(CMAKE_INSTALL_PREFIX "${USER_HOME_DIRECTORY}/Libraries/EHS")
install(TARGETS EHS DESTINATION lib) install(TARGETS EHS DESTINATION lib)
@ -238,27 +238,24 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION include)
install(TARGETS StrToHash DESTINATION bin) install(TARGETS StrToHash DESTINATION bin)
if (IS_ARCH_AMD64) find_package(ZLIB REQUIRED)
find_package(ZLIB REQUIRED) if (ZLIB_FOUND)
if (ZLIB_FOUND)
message(STATUS "ZLIB was found.") message(STATUS "ZLIB was found.")
else () else ()
message(STATUS "ZLIB was not found.") message(STATUS "ZLIB was not found.")
endif () endif ()
find_package(OpenSSL REQUIRED) find_package(OpenSSL REQUIRED)
if (OpenSSL_FOUND) if (OpenSSL_FOUND)
message(STATUS "OpenSSL was found.") message(STATUS "OpenSSL was found.")
else () else ()
message(STATUS "OpenSSL was not found.") message(STATUS "OpenSSL was not found.")
endif () endif ()
target_link_libraries(EHS OpenSSL::SSL OpenSSL::Crypto ZLIB::ZLIB) target_link_libraries(EHS OpenSSL::SSL OpenSSL::Crypto ZLIB::ZLIB)
if (IS_OS_WINDOWS) if (IS_OS_WINDOWS)
target_link_libraries(StrToHash ws2_32 avrt EHS) target_link_libraries(StrToHash ws2_32 avrt EHS)
elseif (IS_OS_LINUX) elseif (IS_OS_LINUX)
target_link_directories(StrToHash PUBLIC ${PROJECT_SOURCE_DIR}) target_link_libraries(StrToHash z xcb xcb-cursor xcb-xfixes xcb-xinput wayland-client z asound EHS)
target_link_libraries(StrToHash z xcb xcb-cursor xcb-xfixes xcb-xinput wayland-client z asound EHS)
endif ()
endif () endif ()