cmake: fix CI env, force lib prefix (needed under windows)
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
parent
4816fedf84
commit
6d82c0b71b
|
@ -8,6 +8,9 @@ on:
|
|||
branches:
|
||||
- '*'
|
||||
|
||||
env:
|
||||
DESTDIR: ${{ github.workspace }}/build/tmp
|
||||
|
||||
jobs:
|
||||
macos-11:
|
||||
runs-on: macos-11
|
||||
|
@ -21,8 +24,6 @@ jobs:
|
|||
- name: build
|
||||
run: cmake --build build -j $(sysctl -n hw.logicalcpu)
|
||||
- name: install
|
||||
env:
|
||||
DESTDIR: ${{ env.GITHUB_WORKSPACE }}/build/tmp
|
||||
run: cmake --install build --verbose
|
||||
|
||||
mingw32-cross:
|
||||
|
@ -50,8 +51,6 @@ jobs:
|
|||
- name: build
|
||||
run: cmake --build build -j $(nproc)
|
||||
- name: install
|
||||
env:
|
||||
DESTDIR: ${{ env.GITHUB_WORKSPACE }}/build/tmp
|
||||
run: cmake --install build --verbose
|
||||
|
||||
mingw64-cross:
|
||||
|
@ -79,8 +78,6 @@ jobs:
|
|||
- name: build
|
||||
run: cmake --build build -j $(nproc)
|
||||
- name: install
|
||||
env:
|
||||
DESTDIR: ${{ env.GITHUB_WORKSPACE }}/build/tmp
|
||||
run: cmake --install build --verbose
|
||||
|
||||
ubuntu-20_04:
|
||||
|
@ -96,8 +93,6 @@ jobs:
|
|||
- name: build
|
||||
run: cmake --build build -j $(nproc)
|
||||
- name: install
|
||||
env:
|
||||
DESTDIR: ${{ env.GITHUB_WORKSPACE }}/build/tmp
|
||||
run: cmake --install build --verbose
|
||||
|
||||
ubuntu-22_04:
|
||||
|
@ -113,8 +108,6 @@ jobs:
|
|||
- name: build
|
||||
run: cmake --build build -j $(nproc)
|
||||
- name: install
|
||||
env:
|
||||
DESTDIR: ${{ env.GITHUB_WORKSPACE }}/build/tmp
|
||||
run: cmake --install build --verbose
|
||||
|
||||
windows:
|
||||
|
@ -126,6 +119,4 @@ jobs:
|
|||
- name: build
|
||||
run: cmake --build build
|
||||
- name: install
|
||||
env:
|
||||
DESTDIR: ${{ env.GITHUB_WORKSPACE }}/build/tmp
|
||||
run: cmake --install build --verbose
|
||||
|
|
|
@ -811,6 +811,7 @@ install(TARGETS carla-standalone
|
|||
set_target_properties(carla-standalone
|
||||
PROPERTIES
|
||||
OUTPUT_NAME carla_standalone2
|
||||
PREFIX lib
|
||||
)
|
||||
|
||||
target_compile_definitions(carla-standalone
|
||||
|
@ -905,6 +906,7 @@ install(TARGETS carla-utils
|
|||
set_target_properties(carla-utils
|
||||
PROPERTIES
|
||||
OUTPUT_NAME carla_utils
|
||||
PREFIX lib
|
||||
)
|
||||
|
||||
target_include_directories(carla-utils
|
||||
|
|
Loading…
Reference in New Issue