Skip to content

MacOs + Windows link against the Release version of Libraries #10899

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
daschuer wants to merge 2 commits into from
Closed

MacOs + Windows link against the Release version of Libraries #10899

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63ae85f
Make sure we use the Release versions form the libraries build with V…
daschuer Sep 14, 2022
7ace51c
debug MAP_IMPORTED_CONFIG_RELWITHDEBINFO
daschuer Sep 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,18 @@ if(DEFINED ENV{VCPKG_DEFAULT_TRIPLET} AND NOT DEFINED VCPKG_TARGET_TRIPLET)
set(VCPKG_TARGET_TRIPLET "$ENV{VCPKG_DEFAULT_TRIPLET}" CACHE STRING "")
endif()

if(DEFINED ENV{VCPKG_ROOT} AND NOT DEFINED CMAKE_TOOLCHAIN_FILE)
set(CMAKE_TOOLCHAIN_FILE "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" CACHE STRING "")
if(DEFINED ENV{VCPKG_ROOT})
if(NOT DEFINED CMAKE_TOOLCHAIN_FILE)
set(CMAKE_TOOLCHAIN_FILE "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" CACHE STRING "")
endif()

# If CMake does not have a mapping for RelWithDebInfo in imported targets
# it will map those configuration to the first valid configuration in the targets
# IMPORTED_CONFIGURATIONS. In most cases this is the Debug configuration which is wrong.
if(NOT DEFINED CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO)
#set(CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO "RelWithDebInfo;Release;")
endif()
message(STATUS "CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO = ${CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO}")
endif()

# Set a default build type if none was specified
Expand Down Expand Up @@ -2617,9 +2627,11 @@ endif()
option(QTKEYCHAIN "Secure credentials storage support for Live Broadcasting profiles" ON)
if(QTKEYCHAIN)
find_package(Qt5Keychain REQUIRED)
target_compile_definitions(mixxx-lib PUBLIC __QTKEYCHAIN__)
target_link_libraries(mixxx-lib PRIVATE ${QTKEYCHAIN_LIBRARIES})
target_include_directories(mixxx-lib SYSTEM PUBLIC ${QTKEYCHAIN_INCLUDE_DIRS})
if(DEFINED ENV{VCPKG_ROOT})
get_property(CONFIGS TARGET qt5keychain PROPERTY MAP_IMPORTED_CONFIG_RELWITHDEBINFO)
message(STATUS "qt5keychain: MAP_IMPORTED_CONFIG_RELWITHDEBINFO = ${MAP_IMPORTED_CONFIG_RELWITHDEBINFO}")
endif()
target_link_libraries(mixxx-lib PRIVATE qt5keychain)
endif()

# USB HID or/and Bulk controller support
Expand Down