Skip to content

Bck 5159 nix header location #22

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

Merged
merged 3 commits into from
Dec 30, 2020
Merged

Bck 5159 nix header location #22

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
632d01f
Adjust target install location for headers
pm-conej Dec 20, 2020
ee5658a
Include dir already in the cmake header prefix
pm-conej Dec 20, 2020
36302f6
Merge branch 'master' into BCK-5159_nix_header_location
pm-conej Dec 30, 2020
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ set_target_properties(cpptcl PROPERTIES
target_include_directories(cpptcl
PUBLIC
$<BUILD_INTERFACE:${cpptcl_INCLUDE_DIR}>
$<INSTALL_INTERFACE:include>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
)
target_include_directories(cpptcl PUBLIC ${TCL_INCLUDE_PATH})
target_link_libraries(cpptcl ${TCL_STUB_LIBRARY})
Expand All @@ -97,7 +97,7 @@ set_target_properties(cpptcl_static PROPERTIES
target_include_directories(cpptcl_static
PUBLIC
$<BUILD_INTERFACE:${cpptcl_INCLUDE_DIR}>
$<INSTALL_INTERFACE:include>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
)
target_include_directories(cpptcl_static PUBLIC ${TCL_INCLUDE_PATH})

Expand All @@ -111,7 +111,7 @@ set_target_properties(cpptcl_runtime PROPERTIES
target_include_directories(cpptcl_runtime
PUBLIC
$<BUILD_INTERFACE:${cpptcl_INCLUDE_DIR}>
$<INSTALL_INTERFACE:include>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
)
target_include_directories(cpptcl_runtime PUBLIC ${TCL_INCLUDE_PATH})
target_link_libraries(cpptcl_runtime ${TCL_LIBRARY})
Expand Down