Merge pull request #19 from coding-cpp/fix/17

building on MacOS
coding-cpp · Aug 22, 2024 · 330759b · 330759b
2 parents cb47035 + a1a6291
commit 330759b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -16,7 +16,6 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 option(USE_INSTALL_RESOURCE_PATH "Set resource path to install location" OFF)
 
 set(BUILD_SHARED_LIBS OFF)
-set(CMAKE_EXE_LINKER_FLAGS "-static")
 
 file(GLOB_RECURSE SOURCES "src/*.cpp")
 file(GLOB_RECURSE LIB_SOURCES "lib/**/src/*.cpp")

diff --git a/docker/build.dockerfile b/docker/build.dockerfile
@@ -6,7 +6,7 @@ WORKDIR /app
 
 COPY . .
 
-RUN mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release .. && make
+RUN mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_EXE_LINKER_FLAGS="-static" .. && make
 
 RUN chmod +x /app/build/server
 
@@ -18,4 +18,4 @@ COPY --from=builder /app/build/server /app/build/server
 
 COPY --from=builder /app/assets /app/assets
 
-ENTRYPOINT ["./server"]
+ENTRYPOINT ["./server"]