diff --git a/CMakeLists.txt b/CMakeLists.txt index e70541a..6c48c3e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -229,7 +229,7 @@ add_executable(StrToHash src/StrToHash.cpp) message("Project Dir: ${PROJECT_SOURCE_DIR}") 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") install(TARGETS EHS DESTINATION lib) @@ -238,27 +238,24 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION include) install(TARGETS StrToHash DESTINATION bin) -if (IS_ARCH_AMD64) - find_package(ZLIB REQUIRED) - if (ZLIB_FOUND) - message(STATUS "ZLIB was found.") - else () - message(STATUS "ZLIB was not found.") - endif () +find_package(ZLIB REQUIRED) +if (ZLIB_FOUND) + message(STATUS "ZLIB was found.") +else () + message(STATUS "ZLIB was not found.") +endif () - find_package(OpenSSL REQUIRED) - if (OpenSSL_FOUND) - message(STATUS "OpenSSL was found.") - else () - message(STATUS "OpenSSL was not found.") - endif () +find_package(OpenSSL REQUIRED) +if (OpenSSL_FOUND) + message(STATUS "OpenSSL was found.") +else () + message(STATUS "OpenSSL was not found.") +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) - target_link_libraries(StrToHash ws2_32 avrt EHS) - 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) - endif () +if (IS_OS_WINDOWS) + target_link_libraries(StrToHash ws2_32 avrt EHS) +elseif (IS_OS_LINUX) + target_link_libraries(StrToHash z xcb xcb-cursor xcb-xfixes xcb-xinput wayland-client z asound EHS) endif () \ No newline at end of file