aboutsummaryrefslogtreecommitdiff
path: root/ports/hpx
diff options
context:
space:
mode:
authorVictor Romero <romerosanchezv@gmail.com>2019-05-02 22:57:43 -0700
committerGitHub <noreply@github.com>2019-05-02 22:57:43 -0700
commit050e71d01dc9e65e6cdf1d13534fc14889e4ae38 (patch)
tree7e39943693b8ac392f37d43a03c66815c6048963 /ports/hpx
parentb72f36e8cdd96ec482785e33f72f99cceebda8ad (diff)
downloadvcpkg-050e71d01dc9e65e6cdf1d13534fc14889e4ae38.tar.gz
vcpkg-050e71d01dc9e65e6cdf1d13534fc14889e4ae38.zip
Remove references to CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS (#5937)
* [various ports] remove references to CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS * [alac,benchmark,capnproto] Fix check_linkage call * [fastlz] Fix SHA512 * [coroutine] Fix dynamic build * [folly] Find double-conversion * [gamma] Use vcpkg_from_github * [librsync] Enable static builds * [netcdf-cxx4] Fix SHA512 * [octomap] Fix static build * [tidy-html5] Fix static build * [various ports] remove custom messages for shared/static builds, modernize some scripts in the meantime * [folly] Use ras0219's fix for link paths * [octomap] Fix exported targets * [uvatlas] Set tool download SHA512 * [duktape+python2] fix portfile to call configure with correct python version, manage python2 also outside win32 * [suitesparse] osx fix * [gtkmm] Call vcpkg_check_linkage after including vcpkg functions * [duktape] Resolve conflicts * [duktape] FIxed typo in Python paths * [wangle] Find zlib * [openssl-uwp] Fix SHA512 * [glib] Allow static builds on non-Windows * [suitesparse] Fix build on Windows * [multiple ports] Bump CONTROL version * [multiple ports] Fix description indent * [directxtk] Fix CONTROL file * [bde,duktape,qpid-proton] Build packages with python2 installed * [binn] remove CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS * [gdal,live555,uriparser] Fix regressions * [live555] Update to 2019.04.24
Diffstat (limited to 'ports/hpx')
-rw-r--r--ports/hpx/CONTROL4
-rw-r--r--ports/hpx/portfile.cmake177
2 files changed, 89 insertions, 92 deletions
diff --git a/ports/hpx/CONTROL b/ports/hpx/CONTROL
index e99f115ae..d77e210b6 100644
--- a/ports/hpx/CONTROL
+++ b/ports/hpx/CONTROL
@@ -1,5 +1,5 @@
Source: hpx
-Version: 1.2.1-0
+Version: 1.2.1-1
Build-Depends: hwloc, boost-accumulators, boost-algorithm, boost-asio, boost-assign, boost-atomic, boost-bimap, boost-chrono, boost-config, boost-context, boost-dynamic-bitset, boost-exception, boost-filesystem, boost-iostreams, boost-lockfree, boost-program-options, boost-range, boost-regex, boost-signals2, boost-smart-ptr, boost-spirit, boost-system, boost-throw-exception, boost-variant, boost-winapi
-Description: The C++ Standards Library for Concurrency and Parallelism
+Description: The C++ Standards Library for Concurrency and Parallelism
HPX is a C++ Standards Library for Concurrency and Parallelism. It implements all of the corresponding facilities as defined by the C++ Standard. Additionally, in HPX we implement functionalities proposed as part of the ongoing C++ standardization process. We also extend the C++ Standard APIs to the distributed case.
diff --git a/ports/hpx/portfile.cmake b/ports/hpx/portfile.cmake
index 2955905ce..3e687e50d 100644
--- a/ports/hpx/portfile.cmake
+++ b/ports/hpx/portfile.cmake
@@ -1,90 +1,87 @@
-include(vcpkg_common_functions)
-
-if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
- message(STATUS "Warning: Static building of HPX not supported yet. Building dynamic.")
- set(VCPKG_LIBRARY_LINKAGE dynamic)
-endif()
-
-vcpkg_from_github(
- OUT_SOURCE_PATH SOURCE_PATH
- REPO STEllAR-GROUP/hpx
- REF 1.2.1
- SHA512 46e9e36cbd9bec935b2a1efce8167c641de88aca8e4dd9c2e3269a1d82ab2965812b5483b6dff4465634f454757b19ad4f73ddcc5ddd73d6efbf28d0819f7dc7
- HEAD_REF master
-)
-
-vcpkg_configure_cmake(
- SOURCE_PATH ${SOURCE_PATH}
- PREFER_NINJA
- OPTIONS
- "-DBOOST_ROOT=${CURRENT_INSTALLED_DIR}/share/boost"
- "-DHWLOC_ROOT=${CURRENT_INSTALLED_DIR}/share/hwloc"
- -DHPX_WITH_VCPKG=ON
- -DHPX_WITH_TESTS=OFF
- -DHPX_WITH_EXAMPLES=OFF
- -DHPX_WITH_TOOLS=OFF
- -DHPX_WITH_RUNTIME=OFF
-)
-
-vcpkg_install_cmake()
-
-# post build cleanup
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/HPX)
-
-file(GLOB_RECURSE CMAKE_FILES "${CURRENT_PACKAGES_DIR}/share/hpx/*.cmake")
-foreach(CMAKE_FILE IN LISTS CMAKE_FILES)
- file(READ ${CMAKE_FILE} _contents)
- string(REGEX REPLACE
- "lib/([A-Za-z0-9_.-]+\\.dll)"
- "bin/\\1"
- _contents "${_contents}")
- string(REGEX REPLACE
- "lib/hpx/([A-Za-z0-9_.-]+\\.dll)"
- "bin/hpx/\\1"
- _contents "${_contents}")
- file(WRITE ${CMAKE_FILE} "${_contents}")
-endforeach()
-
-file(READ "${CURRENT_PACKAGES_DIR}/share/hpx/HPXMacros.cmake" _contents)
-string(REPLACE "set(CMAKE_MODULE_PATH \${CMAKE_MODULE_PATH} \"\${CMAKE_CURRENT_LIST_DIR}/../../lib/cmake/HPX\")" "list(APPEND CMAKE_MODULE_PATH \"\${CMAKE_CURRENT_LIST_DIR}\")" _contents "${_contents}")
-file(WRITE "${CURRENT_PACKAGES_DIR}/share/hpx/HPXMacros.cmake" "${_contents}")
-
-file(INSTALL
- ${SOURCE_PATH}/LICENSE_1_0.txt
- DESTINATION ${CURRENT_PACKAGES_DIR}/share/hpx RENAME copyright)
-
-file(GLOB DLLS ${CURRENT_PACKAGES_DIR}/lib/*.dll)
-if(DLLS)
- file(COPY ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
- file(REMOVE ${DLLS})
-endif()
-
-file(GLOB DLLS ${CURRENT_PACKAGES_DIR}/lib/hpx/*.dll)
-if(DLLS)
- file(COPY ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin/hpx)
- file(REMOVE ${DLLS})
-endif()
-
-file(GLOB DLLS ${CURRENT_PACKAGES_DIR}/debug/lib/*.dll)
-if(DLLS)
- file(COPY ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
- file(REMOVE ${DLLS})
-endif()
-
-file(GLOB DLLS ${CURRENT_PACKAGES_DIR}/debug/lib/hpx/*.dll)
-if(DLLS)
- file(COPY ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin/hpx)
- file(REMOVE ${DLLS})
-endif()
-
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/bazel)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig)
-
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/bazel)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig)
-
-vcpkg_copy_pdbs()
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO STEllAR-GROUP/hpx
+ REF 1.2.1
+ SHA512 46e9e36cbd9bec935b2a1efce8167c641de88aca8e4dd9c2e3269a1d82ab2965812b5483b6dff4465634f454757b19ad4f73ddcc5ddd73d6efbf28d0819f7dc7
+ HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+ OPTIONS
+ "-DBOOST_ROOT=${CURRENT_INSTALLED_DIR}/share/boost"
+ "-DHWLOC_ROOT=${CURRENT_INSTALLED_DIR}/share/hwloc"
+ -DHPX_WITH_VCPKG=ON
+ -DHPX_WITH_TESTS=OFF
+ -DHPX_WITH_EXAMPLES=OFF
+ -DHPX_WITH_TOOLS=OFF
+ -DHPX_WITH_RUNTIME=OFF
+)
+
+vcpkg_install_cmake()
+
+# post build cleanup
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/HPX)
+
+file(GLOB_RECURSE CMAKE_FILES "${CURRENT_PACKAGES_DIR}/share/hpx/*.cmake")
+foreach(CMAKE_FILE IN LISTS CMAKE_FILES)
+ file(READ ${CMAKE_FILE} _contents)
+ string(REGEX REPLACE
+ "lib/([A-Za-z0-9_.-]+\\.dll)"
+ "bin/\\1"
+ _contents "${_contents}")
+ string(REGEX REPLACE
+ "lib/hpx/([A-Za-z0-9_.-]+\\.dll)"
+ "bin/hpx/\\1"
+ _contents "${_contents}")
+ file(WRITE ${CMAKE_FILE} "${_contents}")
+endforeach()
+
+file(READ "${CURRENT_PACKAGES_DIR}/share/hpx/HPXMacros.cmake" _contents)
+string(REPLACE "set(CMAKE_MODULE_PATH \${CMAKE_MODULE_PATH} \"\${CMAKE_CURRENT_LIST_DIR}/../../lib/cmake/HPX\")" "list(APPEND CMAKE_MODULE_PATH \"\${CMAKE_CURRENT_LIST_DIR}\")" _contents "${_contents}")
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/hpx/HPXMacros.cmake" "${_contents}")
+
+file(INSTALL
+ ${SOURCE_PATH}/LICENSE_1_0.txt
+ DESTINATION ${CURRENT_PACKAGES_DIR}/share/hpx RENAME copyright)
+
+file(GLOB DLLS ${CURRENT_PACKAGES_DIR}/lib/*.dll)
+if(DLLS)
+ file(COPY ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
+ file(REMOVE ${DLLS})
+endif()
+
+file(GLOB DLLS ${CURRENT_PACKAGES_DIR}/lib/hpx/*.dll)
+if(DLLS)
+ file(COPY ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin/hpx)
+ file(REMOVE ${DLLS})
+endif()
+
+file(GLOB DLLS ${CURRENT_PACKAGES_DIR}/debug/lib/*.dll)
+if(DLLS)
+ file(COPY ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
+ file(REMOVE ${DLLS})
+endif()
+
+file(GLOB DLLS ${CURRENT_PACKAGES_DIR}/debug/lib/hpx/*.dll)
+if(DLLS)
+ file(COPY ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin/hpx)
+ file(REMOVE ${DLLS})
+endif()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/bazel)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/bazel)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig)
+
+vcpkg_copy_pdbs()