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

[DO NOT MERGE] Fix Boost.Python NumPy discovery #86

Closed
wants to merge 58 commits into from
Closed

[DO NOT MERGE] Fix Boost.Python NumPy discovery #86

wants to merge 58 commits into from

Conversation

dzhoshkun
Copy link
Contributor

@dzhoshkun dzhoshkun commented Apr 12, 2019 •
edited
Loading

Diff for fixing the Boost discovery problems of #81 Once this branch works, commits can be cherry-picked over to #76

dzhoshkun added 17 commits April 10, 2019 11:16
@dzhoshkun
Disabled Boost search in system paths
4d46386
@dzhoshkun
Running only Windows CI for current branch
07c4a4d
@dzhoshkun
DEBUG ONLY: display BOOST_* vars
ea31a37
@dzhoshkun
Using BOOST_ROOT as C:/Boost/boost_1_69_0/boost
9a80751
@dzhoshkun
Using BOOST_ROOT as C:/Boost/boost_1_69_0
3f43f2f
@dzhoshkun
DEBUG ONLY: print MSVC_TOOLSET_VERSION
4eb72d1
@dzhoshkun
Revert "Disabled Boost search in system paths"
9c928a1 
This reverts commit 4d46386.
@dzhoshkun
Using only BOOST_ROOT as C:/Boost/boost-build
925eb56
@dzhoshkun
Using BOOST_INCLUDEDIR as C:/Boost/boost-build/include/boost-1_69
c3cbba4
@dzhoshkun
DEBUG ONLY: copied FindBoost.cmake over from CMake installation
9c5851a
@dzhoshkun
DEBUG ONLY: using src/cmake/boost.python as CMAKE_PREFIX_PATH
4285ecf
@dzhoshkun
DEBUG ONLY: custom message to ensure project-specific FindBoost.cmake…
d8754f7 
… script is used
@dzhoshkun
Revert "DEBUG ONLY: using src/cmake/boost.python as CMAKE_PREFIX_PATH"
8017a82 
This reverts commit 4285ecf.
@dzhoshkun
DEBUG ONLY: setting CMAKE_PREFIX_PATH in CMake
236bd85
@dzhoshkun
Revert "DEBUG ONLY: setting CMAKE_PREFIX_PATH in CMake"
1011f9c 
This reverts commit 236bd85.
@dzhoshkun
Revert "DEBUG ONLY: custom message to ensure project-specific FindBoo…
1e08650 
…st.cmake script is used"

This reverts commit d8754f7.
@dzhoshkun
Revert "DEBUG ONLY: copied FindBoost.cmake over from CMake installation"
275dc54 
This reverts commit 9c5851a.
dzhoshkun added 12 commits April 12, 2019 08:13
@dzhoshkun
Revert "Using BOOST_INCLUDEDIR as C:/Boost/boost-build/include/boost-…
95bfcbc 
…1_69"

This reverts commit c3cbba4.
@dzhoshkun
Revert "Using only BOOST_ROOT as C:/Boost/boost-build"
ab29281 
This reverts commit 925eb56.
@dzhoshkun
Use multi-threaded Boost libraries on Windows
f0d6ad8
@dzhoshkun
Revert "Using BOOST_ROOT as C:/Boost/boost_1_69_0/boost"
67112c1 
This reverts commit 9a80751.
@dzhoshkun
DEBUG ONLY: set FindBoost debug mode
cfddf67
@dzhoshkun
Specifying x64 architecture on cmake call
7a9622c
@dzhoshkun
Including Boost headers first in Python wrapper
ee0009d
@dzhoshkun
Include gil.h on top as well (as it includes Boost.Python components)
aeedb66
@dzhoshkun
Revert "Include gil.h on top as well (as it includes Boost.Python com…
aa018ec 
…ponents)"

This reverts commit aeedb66.
@dzhoshkun
Revert "Including Boost headers first in Python wrapper"
5bafeb3 
This reverts commit ee0009d.
@dzhoshkun
Grouped gil.h inclusion with other Boost.Python includes in wrapper
0646d52
@dzhoshkun
Revert "DEBUG ONLY: set FindBoost debug mode"
451a731 
This reverts commit cfddf67.
dzhoshkun added 29 commits April 12, 2019 10:00
@dzhoshkun
Ugly workaround for MSVC ciso646 / Boost Python conflicts
68e889d
@dzhoshkun
DEBUG ONLY: relaxed condition for ugly workaround to MSVC ciso646 / B…
03821bc 
…oost Python conflicts
@dzhoshkun
DEBUG ONLY: NO condition for ugly workaround to MSVC ciso646 / Boost …
f614ba4 
…Python conflicts
@dzhoshkun
Revert "DEBUG ONLY: NO condition for ugly workaround to MSVC ciso646 …
f781180 
…/ Boost Python conflicts"

This reverts commit f614ba4.
@dzhoshkun
Revert "DEBUG ONLY: relaxed condition for ugly workaround to MSVC cis…
bbedc8a 
…o646 / Boost Python conflicts"

This reverts commit 03821bc.
@dzhoshkun
Added further pointer for MSVC ciso646 / Boost Python conflicts
f4a0540
@dzhoshkun
Revert "DEBUG ONLY: print MSVC_TOOLSET_VERSION"
9502184 
This reverts commit 4eb72d1.
@dzhoshkun
Revert "DEBUG ONLY: display BOOST_* vars"
98f2b7e 
This reverts commit ea31a37.
@dzhoshkun
Revert "Added further pointer for MSVC ciso646 / Boost Python conflicts"
e03767d 
This reverts commit f4a0540.
@dzhoshkun
Revert "Ugly workaround for MSVC ciso646 / Boost Python conflicts"
41de4f4 
This reverts commit 68e889d.
@dzhoshkun
Revert "Grouped gil.h inclusion with other Boost.Python includes in w…
f4a6513 
…rapper"

This reverts commit 0646d52.
@dzhoshkun
Revert "Issue #75: added justification note to ciso646 header inclusion"
18ec5c6 
This reverts commit 13a6f33.
@dzhoshkun
Revert "Issue #75: including ciso646 (iso646.h) header in macros.h to…
80c6ff6 
… enable global inclusion"

This reverts commit 39557f6.
@dzhoshkun
Define new-style logical operator keywords in CMake
77b116f
@dzhoshkun
First putting new-style logical op definitions into a list and then d…
d06be6f 
…efine
@dzhoshkun
Remove MSVC check for logical-op definitions
db650df
@dzhoshkun
Replace forward slash with a minus sign when defining logical-ops
d23e922
@dzhoshkun
Revert "Replace forward slash with a minus sign when defining logical…
a37e65a 
…-ops"

This reverts commit d23e922.
@dzhoshkun
Revert "Remove MSVC check for logical-op definitions"
fc47a83 
This reverts commit db650df.
@dzhoshkun
Revert "First putting new-style logical op definitions into a list an…
0d0115f 
…d then define"

This reverts commit d06be6f.
@dzhoshkun
Revert "Define new-style logical operator keywords in CMake"
4950321 
This reverts commit 77b116f.
@dzhoshkun
Revert "Revert "Issue #75: including ciso646 (iso646.h) header in mac…
faf0e6f 
…ros.h to enable global inclusion""

This reverts commit 80c6ff6.
@dzhoshkun
Revert "Revert "Issue #75: added justification note to ciso646 header…
b6e00cd 
… inclusion""

This reverts commit 18ec5c6.
@dzhoshkun
Grouped gil.h inclusion with other Boost.Python includes in wrapper
ad16b76
@dzhoshkun
Ugly workaround for MSVC ciso646 / Boost Python conflicts
71ebf40
@dzhoshkun
Added further pointer for MSVC ciso646 / Boost Python conflicts
9f54004
@dzhoshkun
Revert "Disabled Boost search in system paths"
cb90057 
This reverts commit 4d46386.
@dzhoshkun
Fixed push-pop order
b27c7b4
@dzhoshkun
Fixed second pop condition
6d86ae7
@dzhoshkun dzhoshkun closed this Apr 12, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
diff-only - DO NOT MERGE
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@dzhoshkun