Browse Source

cmake: set IMPORT_PREFIX for libs, needed for msvc builds

Signed-off-by: falkTX <falktx@falktx.com>
pull/1780/head
falkTX 1 year ago
parent
commit
fa3253b01f
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
2 changed files with 2 additions and 4 deletions
  1. +0
    -2
      .github/workflows/cmake.yml
  2. +2
    -2
      cmake/CMakeLists.txt

+ 0
- 2
.github/workflows/cmake.yml View File

@@ -42,7 +42,6 @@ jobs:
run: cmake -S cmake -B build \
-DCMAKE_CROSSCOMPILING=ON \
-DCMAKE_CROSSCOMPILING_EMULATOR=wine \
-DCMAKE_SHARED_LIBRARY_SUFFIX=".dll" \
-DCMAKE_SYSTEM_NAME=Windows \
-DCMAKE_SYSTEM_PROCESSOR=i686 \
-DCMAKE_C_COMPILER=i686-w64-mingw32-gcc \
@@ -70,7 +69,6 @@ jobs:
run: cmake -S cmake -B build \
-DCMAKE_CROSSCOMPILING=ON \
-DCMAKE_CROSSCOMPILING_EMULATOR=wine \
-DCMAKE_SHARED_LIBRARY_SUFFIX=".dll" \
-DCMAKE_SYSTEM_NAME=Windows \
-DCMAKE_SYSTEM_PROCESSOR=x86_64 \
-DCMAKE_C_COMPILER=x86_64-w64-mingw32-gcc \


+ 2
- 2
cmake/CMakeLists.txt View File

@@ -811,8 +811,8 @@ install(TARGETS carla-standalone
set_target_properties(carla-standalone
PROPERTIES
OUTPUT_NAME carla_standalone2
IMPORT_PREFIX lib
PREFIX lib
SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX}
)

target_compile_definitions(carla-standalone
@@ -907,8 +907,8 @@ install(TARGETS carla-utils
set_target_properties(carla-utils
PROPERTIES
OUTPUT_NAME carla_utils
IMPORT_PREFIX lib
PREFIX lib
SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX}
)

target_include_directories(carla-utils


Loading…
Cancel
Save