config: Update 2 and remove 1 files
This commit is contained in:
@@ -24,10 +24,10 @@ add_executable(${PROJECT_NAME} ${SOURCES})
|
|||||||
configure_file("src/version.hpp.in" "src/autogen/version.hpp" @ONLY)
|
configure_file("src/version.hpp.in" "src/autogen/version.hpp" @ONLY)
|
||||||
|
|
||||||
# Pre-build script
|
# Pre-build script
|
||||||
add_custom_target(run_prebuild_script ALL
|
#add_custom_target(run_prebuild_script ALL
|
||||||
COMMAND bash ${CMAKE_CURRENT_SOURCE_DIR}/cmake_prebuild.sh
|
# COMMAND bash ${CMAKE_CURRENT_SOURCE_DIR}/cmake_prebuild.sh
|
||||||
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
|
# WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
|
||||||
add_dependencies(${PROJECT_NAME} run_prebuild_script)
|
#add_dependencies(${PROJECT_NAME} run_prebuild_script)
|
||||||
|
|
||||||
# Include directories
|
# Include directories
|
||||||
target_include_directories(${PROJECT_NAME} PRIVATE
|
target_include_directories(${PROJECT_NAME} PRIVATE
|
||||||
|
@@ -16,11 +16,11 @@ ENV CCACHE_COMPILERCHECK=content
|
|||||||
ENV CCACHE_MAXSIZE=2G
|
ENV CCACHE_MAXSIZE=2G
|
||||||
|
|
||||||
# Copy only build files first (for better layer caching)
|
# Copy only build files first (for better layer caching)
|
||||||
COPY CMakeLists.txt cmake_prebuild.sh ./
|
#COPY CMakeLists.txt cmake_prebuild.sh ./
|
||||||
COPY src/version.hpp.in src/
|
#COPY src/version.hpp.in src/
|
||||||
|
|
||||||
# Run prebuild script early (this rarely changes)
|
# Run prebuild script early (this rarely changes)
|
||||||
RUN bash cmake_prebuild.sh
|
#RUN bash cmake_prebuild.sh
|
||||||
|
|
||||||
# Copy source files (this invalidates cache when source changes)
|
# Copy source files (this invalidates cache when source changes)
|
||||||
COPY src/ src/
|
COPY src/ src/
|
||||||
|
@@ -1,3 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
echo "cmake_prebuild.sh complete."
|
|
Reference in New Issue
Block a user