|
| 1 | +diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 2 | +index 3b1937a..a75db2b 100644 |
| 3 | +--- a/CMakeLists.txt |
| 4 | ++++ b/CMakeLists.txt |
| 5 | +@@ -20,6 +20,8 @@ OPTION(ENABLE_SERIALDEV "Enable support for serial port devices using libserialp |
| 6 | + OPTION(ENABLE_OPENCV "Enable support for frame enhancements using OpenCV" OFF) |
| 7 | + OPTION(UDEV_INSTALL "Install udev rules on Linux" ON) |
| 8 | + OPTION(EXAMPLES_INSTALL "Build and install examples" OFF) |
| 9 | ++OPTION(ENABLE_BINDIR_INSTALLATION "Split archive and binary installation targets [required for vcpkg installation]" OFF) |
| 10 | ++OPTION(BUILD_SHARED_LIBS "Build libcaer as a shared library" ON) |
| 11 | + |
| 12 | + # Cross-compile support |
| 13 | + IF(NOT USER_LOCAL_PREFIX) |
| 14 | +@@ -98,7 +100,7 @@ INCLUDE(CMakePackageConfigHelpers) |
| 15 | + WRITE_BASIC_CONFIG_VERSION_FILE(${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake VERSION ${PROJECT_VERSION} |
| 16 | + COMPATIBILITY SameMajorVersion) |
| 17 | + SET(include_dirs ${CMAKE_INSTALL_INCLUDEDIR}) |
| 18 | +-IF(CC_MSVC) |
| 19 | ++IF(ENABLE_BINDIR_INSTALLATION) |
| 20 | + SET(export_destination ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}) |
| 21 | + ELSE() |
| 22 | + SET(export_destination ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) |
| 23 | +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
| 24 | +index 377a556..d9c29d7 100644 |
| 25 | +--- a/src/CMakeLists.txt |
| 26 | ++++ b/src/CMakeLists.txt |
| 27 | +@@ -19,6 +19,10 @@ IF(NOT CC_MSVC) |
| 28 | + SET(LIBCAER_COMPILE_OPTIONS "-Wno-unused-function") |
| 29 | + ENDIF() |
| 30 | + |
| 31 | ++IF(OS_MACOS) |
| 32 | ++ LIST(APPEND LIBCAER_COMPILE_OPTIONS "-Wno-implicit-function-declaration") |
| 33 | ++ENDIF() |
| 34 | ++ |
| 35 | + SET(LIBCAER_LINK_LIBRARIES_PRIVATE ${BASE_LIBS}) |
| 36 | + |
| 37 | + IF(OS_LINUX) |
| 38 | +@@ -63,7 +67,7 @@ ENDIF() |
| 39 | + # Set full RPATH |
| 40 | + SET(CMAKE_INSTALL_RPATH ${USER_LOCAL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) |
| 41 | + |
| 42 | +-ADD_LIBRARY(caer SHARED ${LIBCAER_SOURCES}) |
| 43 | ++ADD_LIBRARY(caer ${LIBCAER_SOURCES}) |
| 44 | + IF(CC_MSVC) |
| 45 | + # This flag needs to be propagated down to depending targets to avoid compilation errors |
| 46 | + TARGET_COMPILE_OPTIONS(caer INTERFACE -DWIN32_LEAN_AND_MEAN=ON) |
| 47 | +@@ -94,7 +98,7 @@ IF(ENABLE_STATIC) |
| 48 | + |
| 49 | + SET_TARGET_PROPERTIES(caerStatic PROPERTIES OUTPUT_NAME caer) |
| 50 | + |
| 51 | +- IF(OS_WINDOWS) |
| 52 | ++ IF(ENABLE_BINDIR_INSTALLATION) |
| 53 | + INSTALL( |
| 54 | + TARGETS caerStatic |
| 55 | + EXPORT libcaer-exports |
0 commit comments