From fa3253b01f5f3ec5e5e15029f482166e8563bf51 Mon Sep 17 00:00:00 2001 From: falkTX Date: Wed, 31 May 2023 23:51:14 +0200 Subject: [PATCH] cmake: set IMPORT_PREFIX for libs, needed for msvc builds Signed-off-by: falkTX --- .github/workflows/cmake.yml | 2 -- cmake/CMakeLists.txt | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 1c96bd259..f702bd6e8 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -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 \ diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 892f51c5d..9ef7d1a23 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -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