diff --git a/CMakeLists.txt b/CMakeLists.txt index 5869b57..092322a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,13 +3,13 @@ project(xaiepy) include(collect) -#find_package(OpenSSL REQUIRED) -#if(OPENSSL_FOUND) -# message(STATUS "OpenSSL found") -# message(STATUS "OpenSSL include directories:" ${OPENSSL_INCLUDE_DIR}) -#else() -# message(FATAL_ERROR "OpenSSL Not found.") -#endif() +find_package(OpenSSL REQUIRED) +if(OPENSSL_FOUND) + message(STATUS "OpenSSL found") + message(STATUS "OpenSSL include directories:" ${OPENSSL_INCLUDE_DIR}) +else() + message(FATAL_ERROR "OpenSSL Not found.") +endif() set(BOOTGEN_SRC_DIR ${PROJECT_SOURCE_DIR}/third_party/bootgen) # malloc.h is deprecated and should not be used @@ -44,13 +44,13 @@ target_link_libraries(bootgen_objlib PUBLIC) add_library(bootgen_shared SHARED $) add_library(bootgen_static STATIC $) -#add_executable(bootgen ${BOOTGEN_SRC_DIR}/main.cpp) -#target_include_directories( -# bootgen PUBLIC ${BOOTGEN_SRC_DIR} ${OPENSSL_INCLUDE_DIR} -# ${CMAKE_CURRENT_BINARY_DIR}/include) -#target_compile_definitions(bootgen PRIVATE OPENSSL_USE_APPLINK) -#target_link_libraries(bootgen PRIVATE bootgen_static OpenSSL::SSL -# OpenSSL::applink) +add_executable(bootgen ${BOOTGEN_SRC_DIR}/main.cpp) +target_include_directories( + bootgen PUBLIC ${BOOTGEN_SRC_DIR} ${OPENSSL_INCLUDE_DIR} + ${CMAKE_CURRENT_BINARY_DIR}/include) +target_compile_definitions(bootgen PRIVATE OPENSSL_USE_APPLINK) +target_link_libraries(bootgen PRIVATE bootgen_static OpenSSL::SSL + OpenSSL::applink) add_library(cdo_driver STATIC ${BOOTGEN_SRC_DIR}/cdo-driver/cdo_driver.c) # because primarily this will be linked into libxaie.so... if not you get diff --git a/pyproject.toml b/pyproject.toml index 0adec3f..25e7e5b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -21,6 +21,7 @@ manylinux-x86_64-image = "manylinux_2_28" [tool.cibuildwheel.linux] before-build = [ "pip install -r requirements-dev.txt", + "yum install -y epel-release && yum install -y openssl openssl-devel" ] [tool.cibuildwheel.windows]