Skip to content

Commit

Permalink
Set the installation location to go to a ginkgo subdirectory; Removed…
Browse files Browse the repository at this point in the history
… all third parties from being also installed by `make install`
  • Loading branch information
Thomas Grützmacher committed Dec 14, 2018
1 parent f778ce0 commit 483a600
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/include)

install(DIRECTORY "${PROJECT_SOURCE_DIR}/include/"
DESTINATION "include/"
DESTINATION "include"
FILES_MATCHING PATTERN "*.hpp"
)
install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/include/"
DESTINATION "include/"
DESTINATION "include"
FILES_MATCHING PATTERN "*.hpp"
)

Expand Down
12 changes: 6 additions & 6 deletions cmake/install_helpers.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ function(ginkgo_install_library name subdir)
# install .so and .a files
install(TARGETS "${name}"
EXPORT Ginkgo
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
LIBRARY DESTINATION lib/ginkgo
ARCHIVE DESTINATION lib/ginkgo
)
# copy header files
install(DIRECTORY "${PROJECT_SOURCE_DIR}/${subdir}"
DESTINATION include
FILES_MATCHING PATTERN "*.hpp"
)
#install(DIRECTORY "${PROJECT_SOURCE_DIR}/${subdir}"
# DESTINATION include
# FILES_MATCHING PATTERN "*.hpp"
# )
endfunction()

function(ginkgo_default_includes name)
Expand Down
2 changes: 1 addition & 1 deletion third_party/package_loader.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ macro(load_git_package package_name package_url package_tag)
_load_git_package_impl("${package_name}" "${package_url}" "${package_tag}")
# Add package to the build
add_subdirectory(${CMAKE_CURRENT_BINARY_DIR}/src
${CMAKE_CURRENT_BINARY_DIR}/build)
${CMAKE_CURRENT_BINARY_DIR}/build EXCLUDE_FROM_ALL)
endmacro()

0 comments on commit 483a600

Please sign in to comment.