diff --git a/CMakeLists.txt b/CMakeLists.txt index 800d407..081abf1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -85,7 +85,7 @@ execute_process(COMMAND "${CMAKE_COMMAND}" --build . WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/jwt-cpp" ) -set(JWT_CPP_INCLUDE_DIR "${CMAKE_BINARY_DIR}/third_party/src/jwt_cpp_project/include") +set(JWT_CPP_INCLUDE_DIR "${CMAKE_BINARY_DIR}/third_party/jwt-cpp/include") # -------------------------------------------------- diff --git a/Dockerfile b/Dockerfile index 10ef775..5a20d52 100644 --- a/Dockerfile +++ b/Dockerfile @@ -80,11 +80,8 @@ COPY --chown=app_user:app_user ./third_party ./third_party COPY --chown=app_user:app_user ./src ./src # Run the CMake build (then cleanup) -RUN mkdir build && \ - cd build && \ - cmake .. -GNinja -DCMAKE_INSTALL_PREFIX=/usr/local && \ - cmake --build . --target install && \ - cd .. && \ +RUN cmake -S . -B build -DCMAKE_INSTALL_PREFIX=/usr/local && \ + cmake --build build --target install && \ rm -rf build src third_party CMakeLists.txt COPY --chown=app_user:app_user ./tls ./tls diff --git a/third_party/JWTCPP_CMakeLists.txt.in b/third_party/JWTCPP_CMakeLists.txt.in index 0d9468a..e29bcd6 100644 --- a/third_party/JWTCPP_CMakeLists.txt.in +++ b/third_party/JWTCPP_CMakeLists.txt.in @@ -10,5 +10,8 @@ ExternalProject_Add( PREFIX ${CMAKE_BINARY_DIR}/third_party GIT_REPOSITORY https://github.com/Thalhammer/jwt-cpp.git GIT_TAG v0.7.0 - BUILD_COMMAND "" # This is a header only library + CMAKE_ARGS + -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/third_party/jwt-cpp + -DJWT_BUILD_EXAMPLES=OFF + BUILD_COMMAND "" # This is a header only library )