Skip to content

Commit

Permalink
Pull request #205: Feature/RUM-15798 updating openkit native libcurl …
Browse files Browse the repository at this point in the history
…to 8.4.0 2

Merge in OP/openkit-native from feature/RUM-15798-updating-openkit-native-libcurl-to-8.4.0-2 to main

* commit 'c8ca2362b932e471ddd8e8ce631e252851c03ebe':
  RUM-15798 Updating docs + github actions
  RUM-15798 Changelog + Readme
  RUM-15798 Commenting Libcurl Targets
  RUM-15798 googletest to 1.12.1
  RUM-15798 YAML Update
  RUM-15798 ZLib 1.3
  RUM-15798 Updating to curl 8.4

GitOrigin-RevId: 88d264f6d4c3c93f689c068e9f6f2b61b21fe104
  • Loading branch information
TheHighriser authored and openkitdt committed Nov 30, 2023
1 parent 0349f4b commit 64f72dc
Show file tree
Hide file tree
Showing 5,712 changed files with 511,354 additions and 486,072 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
37 changes: 19 additions & 18 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

name: Linux Build & Test

on:
Expand All @@ -7,42 +8,42 @@ on:
jobs:
build:
name: ${{matrix.NAME}}
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
strategy:
matrix:
include:
- BUILD_TYPE: "Release"
BUILD_SHARED_LIBS: "On"
NAME: "g++5 Release Dynamic x64"
CC: "gcc-5"
CXX: "g++-5"
NAME: "g++9.3 Release Dynamic x64"
CC: "gcc"
CXX: "g++"
- BUILD_TYPE: "Release"
BUILD_SHARED_LIBS: "Off"
NAME: "g++5 Release Static x64"
CC: "gcc-5"
CXX: "g++-5"
NAME: "g++9.3 Release Static x64"
CC: "gcc"
CXX: "g++"
- BUILD_TYPE: "Release"
BUILD_SHARED_LIBS: "On"
NAME: "clang 6.0 Release Dynamic x64"
CC: "clang-6.0"
CXX: "clang++-6.0"
NAME: "clang 10.0 Release Dynamic x64"
CC: "clang"
CXX: "clang++"
- BUILD_TYPE: "Release"
BUILD_SHARED_LIBS: "Off"
NAME: "clang 6.0 Release Static x64"
CC: "clang-6.0"
CXX: "clang++-6.0"
NAME: "clang 10.0 Release Static x64"
CC: "clang"
CXX: "clang++"

steps:
- uses: actions/checkout@v3

- name: Install Compiler
run: |
sudo apt update
sudo apt install ${{ matrix.CC }} ${{ matrix.CXX }}

- name: Create Working directory
run: mkdir -p build

- name: Setup cmake
uses: jwlawson/[email protected]
with:
cmake-version: '3.19.1'

- name: CMake Generation
working-directory: ${{github.workspace}}/build
run: cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=${{matrix.BUILD_TYPE}} -DOPENKIT_BUILD_TESTS=ON -DBUILD_DOC=OFF -DBUILD_SHARED_LIBS=${{matrix.BUILD_SHARED_LIBS}} .. || exit 1
Expand Down
14 changes: 3 additions & 11 deletions 3rdparty/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ set(BUILD_SHARED_LIBS_SAVED "${BUILD_SHARED_LIBS}")
if (NOT BUILD_SHARED_LIBS OR OPENKIT_MONOLITHIC_SHARED_LIB)
set(BUILD_SHARED_LIBS OFF)
endif()
add_subdirectory(zlib-1.2.11)
add_subdirectory(zlib-1.3)
set(BUILD_SHARED_LIBS "${BUILD_SHARED_LIBS_SAVED}")

######
Expand Down Expand Up @@ -69,15 +69,9 @@ set(BUILD_SHARED_LIBS_SAVED "${BUILD_SHARED_LIBS}")
if (NOT BUILD_SHARED_LIBS OR OPENKIT_MONOLITHIC_SHARED_LIB)
set(BUILD_SHARED_LIBS OFF)
endif()
add_subdirectory(curl-7.75.0)
add_subdirectory(curl-8.4.0)
set(BUILD_SHARED_LIBS "${BUILD_SHARED_LIBS_SAVED}")

set_target_properties(libcurl
PROPERTIES
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")

######
# google test & google mock
if(OPENKIT_BUILD_TESTS)
Expand All @@ -98,7 +92,7 @@ if(OPENKIT_BUILD_TESTS)
# by temporarily turning of the BUILD_SHARED_LIBS
set(BUILD_SHARED_LIBS_SAVED "${BUILD_SHARED_LIBS}")
set(BUILD_SHARED_LIBS OFF)
add_subdirectory(googletest-release-1.10.0)
add_subdirectory(googletest-release-1.12.1)
set(BUILD_SHARED_LIBS "${BUILD_SHARED_LIBS_SAVED}")

endif()
Expand All @@ -107,8 +101,6 @@ set_target_properties(gmock PROPERTIES FOLDER 3rdparty/googletest)
set_target_properties(gmock_main PROPERTIES FOLDER 3rdparty/googletest)
set_target_properties(gtest PROPERTIES FOLDER 3rdparty/googletest)
set_target_properties(gtest_main PROPERTIES FOLDER 3rdparty/googletest)
set_target_properties(libcurl PROPERTIES FOLDER 3rdparty/libcurl)
set_target_properties(uninstall PROPERTIES FOLDER 3rdparty/libcurl)
if (BUILD_SHARED_LIBS AND NOT OPENKIT_MONOLITHIC_SHARED_LIB)
set_target_properties(zlib PROPERTIES FOLDER 3rdparty/zlib)
else ()
Expand Down
Loading

0 comments on commit 64f72dc

Please sign in to comment.