Skip to content

Commit

Permalink
Merge pull request #2096 from STEllAR-GROUP/move_cache
Browse files Browse the repository at this point in the history
Moving local cache from external to hpx/util
  • Loading branch information
hkaiser committed Apr 17, 2016
2 parents 6a84ad2 + 3172f8b commit 708cbba
Show file tree
Hide file tree
Showing 24 changed files with 523 additions and 809 deletions.
7 changes: 0 additions & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1616,13 +1616,6 @@ install( # Install HPX Python scripts
# execute_process(COMMAND "${CMAKE_COMMAND}" -E create_symlink "hpx-${HPX_VERSION}" "hpx" WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/python")
# install(DIRECTORY "${CMAKE_BINARY_DIR}/python/hpx" DESTINATION "share")

install( # Install external dependencies
DIRECTORY external/cache/boost
DESTINATION include/hpx/external
COMPONENT core
FILES_MATCHING PATTERN "*.hpp"
PATTERN ".git" EXCLUDE)

if("${HPX_PLATFORM_UC}" STREQUAL "XEONPHI")
# FIXME: push changes upstream
install(
Expand Down
1 change: 0 additions & 1 deletion cmake/HPX_SetupBoost.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ else()
endif()

set(Boost_LIBRARIES ${Boost_TMP_LIBRARIES})
set(Boost_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR}/external/cache)

# If we compile natively for the MIC, we need some workarounds for certain
# Boost headers
Expand Down
363 changes: 0 additions & 363 deletions external/cache/libs/cache/build/cache/cache.vcproj

This file was deleted.

0 comments on commit 708cbba

Please sign in to comment.