Skip to content

Commit

Permalink
iox-eclipse-iceoryx#1481 Fix interface include directories in CMake
Browse files Browse the repository at this point in the history
Signed-off-by: Dietrich Krönke <[email protected]>
  • Loading branch information
dkroenke committed Jul 11, 2022
1 parent d5be6d8 commit c43f5cc
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions doc/website/release-notes/iceoryx-unreleased.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
- Restrict runtime (application) names to valid file names to solve failures in the underlying posix constructs [#\1419](https://github.com/eclipse-iceoryx/iceoryx/issues/1419)
- CMake config assumes relative `CMAKE_INSTALL_LIBDIR` [\#1393](https://github.com/eclipse-iceoryx/iceoryx/issues/1393)
- Build error on certain versions of Windows/Visual Studio [\#1476](https://github.com/eclipse-iceoryx/iceoryx/issues/1476)
- Fix INTERFACE_INCLUDE_DIRECTORIES in CMake [\#1481](https://github.com/eclipse-iceoryx/iceoryx/issues/1481)

**Refactoring:**

Expand Down
4 changes: 2 additions & 2 deletions iceoryx_hoofs/cmake/IceoryxPackageHelper.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ Macro(iox_make_unique_includedir)

if(MAKE_UNIQUE_INCLUDEDIR)
set(_unique_dir "iceoryx/v${IOX_VERSION_STRING}")
if(PREFIX STREQUAL "")
if("${PREFIX}" STREQUAL "")
set(PREFIX "${_unique_dir}")
else()
set(PREFIX "${PREFIX}/${_unique_dir}")
Expand Down Expand Up @@ -205,7 +205,7 @@ endMacro()
Macro(iox_add_executable)
set(switches USE_C_LANGUAGE PLACE_IN_BUILD_ROOT)
set(arguments TARGET STACK_SIZE)
set(multiArguments FILES LIBS INCLUDE_DIRECTORIES LIBS_QNX LIBS_LINUX LIBS_UNIX LIBS_WIN32 LIBS_APPLE
set(multiArguments FILES LIBS INCLUDE_DIRECTORIES LIBS_QNX LIBS_LINUX LIBS_UNIX LIBS_WIN32 LIBS_APPLE
BUILD_INTERFACE INSTALL_INTERFACE)
cmake_parse_arguments(IOX "${switches}" "${arguments}" "${multiArguments}" ${ARGN} )

Expand Down

0 comments on commit c43f5cc

Please sign in to comment.