Merge pull request #4269 from luau-project/fix-rc-include
fix: quote include directory for resource compiler
This commit is contained in:
@@ -92,6 +92,31 @@ jobs:
|
|||||||
sudo apt install liblzma-dev
|
sudo apt install liblzma-dev
|
||||||
FUZZERTEST=-T1mn ZSTREAM_TESTTIME=-T1mn make cmakebuild V=1
|
FUZZERTEST=-T1mn ZSTREAM_TESTTIME=-T1mn make cmakebuild V=1
|
||||||
|
|
||||||
|
cmake-source-directory-with-spaces:
|
||||||
|
runs-on: ${{ matrix.os }}
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
include:
|
||||||
|
- os: ubuntu-latest
|
||||||
|
generator: "Unix Makefiles"
|
||||||
|
- os: windows-latest
|
||||||
|
generator: "NMake Makefiles"
|
||||||
|
- os: macos-latest
|
||||||
|
generator: "Unix Makefiles"
|
||||||
|
env:
|
||||||
|
SRC_DIR: "source directory with spaces"
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # tag=v4.1.1
|
||||||
|
with:
|
||||||
|
path: "${{ env.SRC_DIR }}"
|
||||||
|
- uses: ilammy/msvc-dev-cmd@v1
|
||||||
|
if: ${{ matrix.generator == 'NMake Makefiles' }}
|
||||||
|
- name: cmake build on a source directory with spaces
|
||||||
|
run: |
|
||||||
|
cmake -S "${{ env.SRC_DIR }}/build/cmake" -B build -DBUILD_TESTING=ON -G "${{ matrix.generator }}" -DCMAKE_BUILD_TYPE=Release --install-prefix "${{ runner.temp }}/install"
|
||||||
|
cmake --build build --config Release
|
||||||
|
cmake --install build --config Release
|
||||||
|
|
||||||
cpp-gnu90-c99-compatibility:
|
cpp-gnu90-c99-compatibility:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
|
|||||||
@@ -118,7 +118,7 @@ endmacro ()
|
|||||||
|
|
||||||
# Define directories containing the library's public headers
|
# Define directories containing the library's public headers
|
||||||
set(PUBLIC_INCLUDE_DIRS ${LIBRARY_DIR})
|
set(PUBLIC_INCLUDE_DIRS ${LIBRARY_DIR})
|
||||||
set(CMAKE_RC_FLAGS "${CMAKE_RC_FLAGS} /I ${LIBRARY_DIR}")
|
set(CMAKE_RC_FLAGS "${CMAKE_RC_FLAGS} /I \"${LIBRARY_DIR}\"")
|
||||||
# Split project to static and shared libraries build
|
# Split project to static and shared libraries build
|
||||||
set(library_targets)
|
set(library_targets)
|
||||||
if (ZSTD_BUILD_SHARED)
|
if (ZSTD_BUILD_SHARED)
|
||||||
|
|||||||
Reference in New Issue
Block a user