Fix building nest without python #342

Merged
merged 2 commits into from May 18, 2016

Conversation

Projects
None yet
3 participants
@tammoippen
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.

Fix building nest without python
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.
nest/CMakeLists.txt
@@ -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.

@heplesser

heplesser May 18, 2016

Contributor

There should be an empty line before this section.

@heplesser

heplesser May 18, 2016

Contributor

There should be an empty line before this section.

@heplesser

This comment has been minimized.

Show comment
Hide comment
@heplesser

heplesser May 18, 2016

Contributor

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

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

This comment has been minimized.

Show comment
Hide comment
@tammoippen

tammoippen May 18, 2016

Contributor

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

Contributor

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

This comment has been minimized.

Show comment
Hide comment
@heplesser

heplesser May 18, 2016

Contributor

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

Contributor

heplesser commented May 18, 2016

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

@jougs

This comment has been minimized.

Show comment
Hide comment
@jougs

jougs May 18, 2016

Contributor

👍 and merging.

Contributor

jougs commented May 18, 2016

👍 and merging.

@jougs jougs merged commit 193594f into nest:master May 18, 2016

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@steffengraber steffengraber referenced this pull request in steffengraber/nest-simulator May 20, 2016

Merged

Help build #1

@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