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.

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

Fix building nest without python #342

Merged
merged 2 commits into from May 18, 2016
Merged

Conversation

@tammoippen
Copy link
Contributor

tammoippen commented May 18, 2016

The PR #323 removed GNUReadline from PyNEST, but when building nest without python the library libnest.dylib now expects GNUReadline, as no _IS_PYNEST is given, which does not compile (at least not on OS X). This PR allows to differentiate building the NEST CLI, PyNEST and a standalone library.

The PR #323 removed GNUReadline from PyNEST, but when building nest without python
the library `libnest.so` now expects GNUReadline, as no _IS_PYNEST is given.
This commit allows to differentiate building the NEST CLI, PyNEST and a standalone
library.
@@ -46,6 +46,9 @@ target_include_directories( nest PRIVATE
${PROJECT_SOURCE_DIR}/nestkernel
${SLI_MODULE_INCLUDE_DIRS}
)
target_compile_definitions( nest PRIVATE

This comment has been minimized.

Copy link
@heplesser

heplesser May 18, 2016

Contributor

There should be an empty line before this section.

@heplesser
Copy link
Contributor

heplesser commented May 18, 2016

@tammoippen Could one now remove the -D_IS_PYNEST macro? It should not play any role in this directory, should it?

@tammoippen
Copy link
Contributor Author

tammoippen commented May 18, 2016

@heplesser No, we still need it, as it adds an argument to neststartup and adds the pynest-init.sli file.

@heplesser
Copy link
Contributor

heplesser commented May 18, 2016

@tammoippen Sorry I overlooked that! Then, 👍 from me.

@jougs
Copy link
Contributor

jougs commented May 18, 2016

👍 and merging.

@jougs jougs merged commit 193594f into nest:master May 18, 2016
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@tammoippen tammoippen deleted the tammoippen:cli_without_pynest branch Jul 1, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.