Skip to content
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

Jump to bottom

Fix zmq cmake config #280

Merged
merged 2 commits into from
Oct 10, 2017
Merged

Fix zmq cmake config #280

merged 2 commits into from
Oct 10, 2017

Conversation

chuckatkins
Copy link
Contributor

No description provided.

@chuckatkins
Copy link
Contributor Author

@JasonRuonanWang Please check that this addresses your issue

JasonRuonanWang
JasonRuonanWang approved these changes Oct 10, 2017
View reviewed changes
Copy link
Member

@JasonRuonanWang JasonRuonanWang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This works for me. Thanks.

Programatically generate ADIOSConfig.h contents
0f43bde 
Use a 2-pass approach to generate ADIOS2.config.  The first pass
generates the configurable options in the header and the second pass
configures them.  This allows for consistency in the options used and
thier ordering with respect to where they're used elsewhere.
@chuckatkins chuckatkins merged commit c63e759 into ornladios:master Oct 10, 2017
@chuckatkins chuckatkins deleted the fix-zmq-cmake-config branch October 10, 2017 19:41
chuckatkins pushed a commit to chuckatkins/ADIOS2 that referenced this pull request Oct 30, 2020
pugixml 2020-10-26 (30761e48)
9633b24 
Code extracted from:

    https://github.com/zeux/pugixml.git

at commit 30761e48dfbd810912cf94f3eff2c410f371e0ab (master).

Upstream Shortlog
-----------------

Arnaud Botella (1):
      aa2e0909 Add POSITION_INDEPENDENT_CODE option

Arseny Kapoulkine (32):
      b67ef29c docs: Draw attention to the fact that you have to compile pugixml.cpp
      160c1c23 docs: Improve null node comparison wording
      d902709d Refactor CMakeLists.txt support for multiple targets
      93c7bacb XPath: Create set for a|b in order before duplicate filtering
      930a701f tests: Disable flaky test
      c55ea3bc XPath: Make remove_duplicates generate stable order
      12e8b699 tests: Expand out-of-memory union tests
      b0156991 docs: Regenerate HTML documentation
      8bf806c0 tests: Move control char tests to test_write.cpp
      434c4a4d Remove contrib folder
      29f3177d Remove contrib from Makefile and readme.txt
      7247a823 XPath: Add missing inline/PUGI__FN specifiers
      a5568455 tests: Work around test warnings in clang-7
      44e4d7e4 Update version to 1.10
      946de603 Don't escape attribute quotation symbol
      c6607740 Never escape > in attribute values
      3c59df55 docs: Update documentation for 1.10 release
      5329ba03 scripts: Update NuGet package spec
      6202519c tests: Add memory safety tests for remove_children/attributes
      6934b123 Move pugixml.rc to scripts/
      53a30c65 Cleanup first_element_by_path
      85a39b95 tests: Add a dedicated test for XPath variable conversion
      546cafef XPath: Add a clarification comment for ast_variable fallthrough
      76c39144 XPath: Remove the use of fallthrough switch cases
      5e64076a Adjust node_copy_tree to be more explicit about invariants
      f49d7acd Clarify the document element behavior.
      23ca9404 Work around a false positive in MSVC debug runtime checker
      f08768d9 Fix PowerShell errors on stderr
      1f84db83 XPath: Restrict AST depth to prevent stack overflow
      c7090e6c Fix tests in wchar mode
      20aef1cd Fix stack overflow in tests on MSVC x64
      8e5b8e0f XPath: Fix stack overflow in functions with long argument lists

Artur Leonov (1):
      c5752917 fix running tests (ornladios#280)

Gianfranco Costamagna (1):
      2c24e90c Update CMakeLists.txt to rename the static and shared libraries to pugixml

Isabella Muerte (7):
      195dfe1d 🚧 Begin moving pugixml to modern(ish) CMake
      1c5a0bb3 ✨ Update CMake to modern approach
      8a0aac18 Update `check` command to output text on failure
      ad93a373 Adjust MSVC runtime settings as requested.
      3df50363 🔥 Remove commented out CMake code
      6949232b 🐛 Fix install locations for pkgconfig *and* cmake
      99ad2616 🐛 Fix incorrect installation location for exported CMake targets

James McCollum (1):
      24e45406 Added fix to pugixml_dll.rc so shared lib can be built with MinGW

Jan Niklas Hasse (1):
      c2d90c49 Use nullptr in pugixml.hpp if available, see ornladios#91

Joel Andres Granados (1):
      84e32273 Update nuget creation to VS2019 (ornladios#291)

Julian Xhokaxhiu (1):
      5fdc78b6 [Cmake] Static build should not export APIs

Kyle Edwards (3):
      8c74d8b1 Fix multiple-rules-for-target error
      184e6ed9 Use COMPONENT arguments in install() commands
      d272f110 Export targets from build directory

Lucas Amoudruz (1):
      78e98c44 explicit casts for -Wconversions warnings in gcc

Matan Nassau (1):
      4f6e7454 fix cmake option USE_POSTFIX (ornladios#283)

Tuan Anh Tran (2):
      fd7326fb feat: add remove_attributes() and remove_children() (ornladios#296)
      b9b2aeec Custom precision (ornladios#300)

Valeriy Van (1):
      cda86234 Fixing possible null pointer dereference

WheretIB (1):
      36e274d9 Visual Studio Natvis visualization for compact mode

Wolfgang Stöggl (3):
      fdf02957 Fix minor typos (ornladios#286)
      ccb63a91 Add LICENSE.md to RELEASE (ornladios#295)
      8b074b17 Fix debug postfix in pkgconfig file

Yan Pas (1):
      138976fd unit test and doc

Yan Pashkovsky (1):
      66e1b4e0 format_skip_control_chars

basti171 (1):
      1d59e4d9 make pugixml build static and shared via cmake (ornladios#257)

denchat (2):
      1312a46d std::random_shuffle is removed in current standard
      86e0fe19 Fix forgotten indentation

lady mesh (1):
      6fb765ca Add: Windows DLL version info header (ornladios#298)

m-naumann (1):
      5a867cb1 Add support for using single quotes to enclose attribute values

rip.nsk (1):
      ab86960e Add "Include pugixml.cpp" and "Header Only" linkage options
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JasonRuonanWang JasonRuonanWang JasonRuonanWang approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@chuckatkins @JasonRuonanWang