diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 311fe904..68fccde5 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -5,15 +5,7 @@ ARG VARIANT="jammy" FROM mcr.microsoft.com/vscode/devcontainers/base:0-${VARIANT} RUN apt-get update && \ - apt-get install -qq -y git libssl-dev libcurl4-openssl-dev uncrustify cmake g++ - -RUN git clone https://github.com/warmcat/libwebsockets --depth 1 --branch v4.2-stable && \ - cd libwebsockets && \ - mkdir build && \ - cd build && \ - cmake -DLWS_WITHOUT_TESTAPPS=ON -DLWS_WITHOUT_TEST_SERVER=ON-DLWS_WITHOUT_TEST_SERVER_EXTPOLL=ON \ - -DLWS_WITHOUT_TEST_PING=ON -DLWS_WITHOUT_TEST_CLIENT=ON -DCMAKE_C_FLAGS="-fpic" -DCMAKE_INSTALL_PREFIX=/usr/local .. && \ - make && make install + apt-get install -qq -y git libssl-dev libcurl4-openssl-dev libwebsockets-dev uncrustify cmake g++ # Build pre-requisite: libyaml RUN git clone https://github.com/yaml/libyaml --depth 1 --branch release/0.2.5 && \ diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 499c2e3b..1213a5aa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,17 +15,7 @@ jobs: - name: Prepare run: | sudo apt-get update - sudo apt-get install -y libssl-dev libcurl4-openssl-dev uncrustify valgrind - - name: Prepare libwebsockets - run: | - git clone https://github.com/warmcat/libwebsockets --depth 1 --branch v4.2-stable - cd libwebsockets - mkdir build - cd build - cmake .. -DLWS_WITHOUT_TESTAPPS=ON -DLWS_WITHOUT_TEST_SERVER=ON-DLWS_WITHOUT_TEST_SERVER_EXTPOLL=ON \ - -DLWS_WITHOUT_TEST_PING=ON -DLWS_WITHOUT_TEST_CLIENT=ON -DCMAKE_C_FLAGS="-fpic" - make -j $(cat /proc/cpuinfo | grep processor | wc -l) - sudo make install + sudo apt-get install -y libssl-dev libcurl4-openssl-dev libwebsockets-dev uncrustify valgrind - name: Prepare libyaml run: | git clone https://github.com/yaml/libyaml --depth 1 --branch release/0.2.5 diff --git a/README.md b/README.md index 1554860c..31921d1c 100644 --- a/README.md +++ b/README.md @@ -14,17 +14,7 @@ git clone https://github.com/kubernetes-client/c CLIENT_REPO_ROOT=${PWD}/c # Install pre-requisites -sudo apt-get install libssl-dev libcurl4-openssl-dev uncrustify - -# Build pre-requisite: libwebsockets -git clone https://github.com/warmcat/libwebsockets --depth 1 --branch v4.2-stable -cd libwebsockets -mkdir build -cd build -cmake -DLWS_WITHOUT_TESTAPPS=ON -DLWS_WITHOUT_TEST_SERVER=ON -DLWS_WITHOUT_TEST_SERVER_EXTPOLL=ON \ - -DLWS_WITHOUT_TEST_PING=ON -DLWS_WITHOUT_TEST_CLIENT=ON -DCMAKE_C_FLAGS="-fpic" -DCMAKE_INSTALL_PREFIX=/usr/local .. -make -sudo make install +sudo apt-get install libssl-dev libcurl4-openssl-dev libwebsockets-dev uncrustify # Build pre-requisite: libyaml git clone https://github.com/yaml/libyaml --depth 1 --branch release/0.2.5 diff --git a/kubernetes/Config.cmake.in b/kubernetes/Config.cmake.in index 84d150f3..5eeaaa5d 100644 --- a/kubernetes/Config.cmake.in +++ b/kubernetes/Config.cmake.in @@ -1,6 +1,6 @@ find_package(OpenSSL REQUIRED) find_package(ZLIB REQUIRED) find_package(yaml CONFIG REQUIRED) -find_package(libwebsockets CONFIG REQUIRED) +find_package(Libwebsockets CONFIG REQUIRED) include("${CMAKE_CURRENT_LIST_DIR}/@pkgName@Targets.cmake") diff --git a/kubernetes/PreTarget.cmake b/kubernetes/PreTarget.cmake index 61876441..382e4a48 100644 --- a/kubernetes/PreTarget.cmake +++ b/kubernetes/PreTarget.cmake @@ -44,5 +44,5 @@ list(APPEND HDRS include/generic.h include/utils.h) -find_package(libwebsockets CONFIG REQUIRED) +find_package(Libwebsockets CONFIG REQUIRED) find_package(yaml CONFIG REQUIRED) \ No newline at end of file