Skip to content
This repository was archived by the owner on Nov 5, 2024. It is now read-only.

Commit

Permalink
re-enable ssl and bootgen
Browse files Browse the repository at this point in the history
  • Loading branch information
makslevental committed May 8, 2024
1 parent f1bb9f8 commit 22b3fbf
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 16 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
run: |
pushd wheelhouse
pip install xaiepy*.whl
pip install xaiepy -f $PWD
python ../tests/test_xaie_ctypes.py
popd
Expand Down Expand Up @@ -123,7 +123,7 @@ jobs:
run: |
popd wheelhouse
pip install xaiepy*.whl
pip install xaiepy -f $PWD
python ../tests/test_xaie_ctypes.py
pushd
Expand All @@ -137,6 +137,8 @@ jobs:

upload_bindings_wheels:

if: github.event_name != 'pull_request'

needs: [build, build-linux-aarch64]

runs-on: ubuntu-latest
Expand Down
28 changes: 14 additions & 14 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -44,13 +44,13 @@ target_link_libraries(bootgen_objlib PUBLIC)
add_library(bootgen_shared SHARED $<TARGET_OBJECTS:bootgen_objlib>)
add_library(bootgen_static STATIC $<TARGET_OBJECTS:bootgen_objlib>)

#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
Expand Down

0 comments on commit 22b3fbf

Please sign in to comment.