Skip to content

Honor CMAKE_DEBUG_POSTFIX when combining static libraries for debug build of cpp client #209

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

Open
nbmaltais wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −3
Open

Honor CMAKE_DEBUG_POSTFIX when combining static libraries for debug build of cpp client #209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion client/cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,9 +212,11 @@ target_compile_definitions(ProjectAirsimClient
)

if(WIN32)

set(PROJECTAIRSIM_CPP_CLIENT_FINAL_LIB
"${CMAKE_CURRENT_BINARY_DIR}/ProjectAirSimCppClient.lib"
"${CMAKE_CURRENT_BINARY_DIR}/ProjectAirSimCppClient$<$<CONFIG:Debug>:${CMAKE_DEBUG_POSTFIX}>.lib"
)

add_custom_command(
OUTPUT ${PROJECTAIRSIM_CPP_CLIENT_FINAL_LIB}
COMMAND ${CMAKE_COMMAND} -E remove -f ${PROJECTAIRSIM_CPP_CLIENT_FINAL_LIB}
Expand Down
10 changes: 8 additions & 2 deletions client/cpp/packaging/ProjectAirSimCppClientConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,12 @@ set(ProjectAirSimCppClient_INCLUDE_DIR "${PACKAGE_PREFIX_DIR}/include")
set(ProjectAirSimCppClient_LIB_DIR "${PACKAGE_PREFIX_DIR}/lib")
set(ProjectAirSimCppClient_BIN_DIR "${PACKAGE_PREFIX_DIR}/bin")

set(_projectairsim_cpp_client_lib_name
set(_projectairsim_cpp_client_lib_name_release
"@PROJECTAIRSIM_CPP_CLIENT_LIB_PREFIX@ProjectAirSimCppClient@PROJECTAIRSIM_CPP_CLIENT_LIB_SUFFIX@"
)
set(_projectairsim_cpp_client_lib_name_debug
"@PROJECTAIRSIM_CPP_CLIENT_LIB_PREFIX@ProjectAirSimCppClient@CMAKE_DEBUG_POSTFIX@@PROJECTAIRSIM_CPP_CLIENT_LIB_SUFFIX@"
)

set(_projectairsim_cpp_client_link_libs)

Expand All @@ -28,10 +31,13 @@ endif()
if(NOT TARGET ProjectAirSim::Client)
add_library(ProjectAirSim::Client STATIC IMPORTED)
set_target_properties(ProjectAirSim::Client PROPERTIES
IMPORTED_LOCATION "${ProjectAirSimCppClient_LIB_DIR}/${_projectairsim_cpp_client_lib_name}"
IMPORTED_LOCATION_RELEASE "${ProjectAirSimCppClient_LIB_DIR}/${_projectairsim_cpp_client_lib_name_release}"
IMPORTED_LOCATION_DEBUG "${ProjectAirSimCppClient_LIB_DIR}/${_projectairsim_cpp_client_lib_name_debug}"
INTERFACE_INCLUDE_DIRECTORIES "${ProjectAirSimCppClient_INCLUDE_DIR}"
INTERFACE_COMPILE_DEFINITIONS "PROJECTAIRSIMCLIENT_STATIC;NNGI_STATIC_LIB;NNG_STATIC_LIB;MSGPACK_NO_BOOST"
INTERFACE_LINK_LIBRARIES "${_projectairsim_cpp_client_link_libs}"
MAP_IMPORTED_CONFIG_MINSIZEREL Release
MAP_IMPORTED_CONFIG_RELWITHDEBINFO Release
)
endif()

Expand Down