Fixes to get 2.0 building on macOS #112
Draft
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
There were some errors in CMakeLists that made it not generate correctly on my Mac. These changes allow for specification of some of the library paths on the command line and also fix an error with including the icon file in the macOS executable bundle.
ericpre
reviewed
Oct 27, 2021
| @@ -359,7 +359,7 @@ void generateProjectedPotentials3D(Parameters<PRISMATIC_FLOAT_PRECISION> &pars, | |||
|
|
|||
| Array2D<std::complex<PRISMATIC_FLOAT_PRECISION>> qyShift = zeros_ND<2,std::complex<PRISMATIC_FLOAT_PRECISION>>({{qya.get_dimj(), qya.get_dimi()}}); | |||
| Array2D<std::complex<PRISMATIC_FLOAT_PRECISION>> qxShift = zeros_ND<2,std::complex<PRISMATIC_FLOAT_PRECISION>>({{qya.get_dimj(), qya.get_dimi()}}); | |||
| std::complex<PRISMATIC_FLOAT_PRECISION> I = 0.0 + 1.0i; | |||
| std::complex<PRISMATIC_FLOAT_PRECISION> I (0.0, 1.0); | |||
There was a problem hiding this comment.
I came to the same patch in the conda-forge recipe to fix the compilation error:
conda-forge/prismatic_split-feedstock@59549d6
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I had to make a tweak to how cmake handles the icon file and how it accepts command line hints for libraries to get it to generate the makefile. (Likely the second problem is just on my machine, since I have a million versions of every library Prismatic needs and I need to be able to hint the right prefixes.)
There is also a change in PRISM01_calcPotentials.cpp, to the construction of the imaginary unit
I, which threw an error. Maybe I am using a newer version of C++, maybe it's because I am using clang, I'm not sure...Leaving this as a draft for right now as there are still some bugs with the build, and if it's something I can resolve easily myself I'll do those.