File tree Expand file tree Collapse file tree 2 files changed +20
-0
lines changed Expand file tree Collapse file tree 2 files changed +20
-0
lines changed Original file line number Diff line number Diff line change @@ -25,6 +25,17 @@ set_and_check(@PROJECT_NAME@_LIB_DIR "@PACKAGE_LIB_INSTALL_DIR@")
25
25
find_package (fastcdr REQUIRED )
26
26
find_package (foonathan_memory REQUIRED )
27
27
find_package (TinyXML2 QUIET )
28
+
29
+ # Find atomic using Fast DDS FindAtomic.cmake
30
+ # 1. Save incoming CMAKE_MODULE_PATH
31
+ # 2. Extend CMAKE_MODULE_PATH so atomic can be found
32
+ # 3. Reset CMAKE_MODULE_PATH to incoming value
33
+ # 4. Unset temp variable
34
+ set (TEMP_CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH} " )
35
+ set (CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH} ;${CMAKE_CURRENT_LIST_DIR} /modules" )
36
+ find_package (Atomic MODULE REQUIRED )
37
+ set (CMAKE_MODULE_PATH "${TEMP_CMAKE_MODULE_PATH} " )
38
+ unset (TEMP_CMAKE_MODULE_PATH )
28
39
@FASTRTPS_PACKAGE_OPT_DEPS@
29
40
30
41
include (
${CMAKE_CURRENT_LIST_DIR} /@[email protected] )
Original file line number Diff line number Diff line change @@ -405,6 +405,9 @@ elseif(NOT EPROSIMA_INSTALLER)
405
405
${THIRDPARTY_BOOST_INCLUDE_DIR}
406
406
)
407
407
408
+ # PRIVACY is PUBLIC by default
409
+ set (PRIVACY "PUBLIC" )
410
+
408
411
# Made linked libraries PRIVATE to prevent local directories in Windows installer.
409
412
if (EPROSIMA_INSTALLER_MINION )
410
413
set (PRIVACY "PRIVATE" )
@@ -630,6 +633,12 @@ elseif(NOT EPROSIMA_INSTALLER)
630
633
COMPONENT cmake
631
634
)
632
635
636
+ # Install FindAtomic.cmake in case external application want to make use of it
637
+ install (FILES ${PROJECT_SOURCE_DIR} /cmake/modules/FindAtomic.cmake
638
+ DESTINATION ${INSTALL_DESTINATION_PATH} /modules
639
+ COMPONENT cmake
640
+ )
641
+
633
642
if (MSVCARCH_EXTENSION )
634
643
string (TOUPPER "${MSVC_ARCH} " MSVC_ARCH_UPPER )
635
644
set (CPACK_COMPONENT_LIBRARIES_${MSVC_ARCH_UPPER}_DISPLAY_NAME "${MSVC_ARCH} " PARENT_SCOPE )
You can’t perform that action at this time.
0 commit comments