CMake refactors

voltrondata · Mar 3, 2024 · 70d2ee3 · 70d2ee3
1 parent 1ddeac4
commit 70d2ee3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
 )