Skip to content

Commit cdc4eaa

Browse files
Mario-DLmergify[bot]
authored andcommitted
Fix cmake generator evaluation (#5435)
Signed-off-by: Mario Dominguez <[email protected]> (cherry picked from commit dbb87b7) # Conflicts: # src/cpp/CMakeLists.txt
1 parent 8935858 commit cdc4eaa

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

src/cpp/CMakeLists.txt

+7
Original file line numberDiff line numberDiff line change
@@ -461,6 +461,13 @@ target_compile_definitions(${PROJECT_NAME} PRIVATE
461461
$<$<NOT:$<BOOL:${IS_THIRDPARTY_BOOST_SUPPORTED}>>:FASTDDS_SHM_TRANSPORT_DISABLED> # Do not compile SHM Transport
462462
$<$<BOOL:${SHM_TRANSPORT_DEFAULT}>:SHM_TRANSPORT_BUILTIN> # Enable SHM as built-in transport
463463
$<$<BOOL:${STDOUTERR_LOG_CONSUMER}>:STDOUTERR_LOG_CONSUMER> # Enable StdoutErrConsumer as default LogConsumer
464+
<<<<<<< HEAD
465+
=======
466+
INTERFACE
467+
$<$<BOOL:${WIN32}>:${PROJECT_NAME_UPPER}_NO_LIB>
468+
PUBLIC
469+
$<$<TARGET_EXISTS:${PROJECT_NAME}>:$<$<STREQUAL:$<TARGET_PROPERTY:${PROJECT_NAME},TYPE>,SHARED_LIBRARY>:${PROJECT_NAME_UPPER}_DYN_LINK>>
470+
>>>>>>> dbb87b7a3 (Fix cmake generator evaluation (#5435))
464471
)
465472

466473
# Define public headers

0 commit comments

Comments
 (0)