Skip to content

Fixes to get 2.0 building on macOS - #112

Draft
sezelt wants to merge 2 commits into
prism-em:masterfrom
sezelt:patch-1
Draft

Fixes to get 2.0 building on macOS#112
sezelt wants to merge 2 commits into
prism-em:masterfrom
sezelt:patch-1

Conversation

@sezelt

@sezelt sezelt commented Oct 27, 2021

Copy link
Copy Markdown
Contributor

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.

sezelt and others added 2 commits October 26, 2021 18:27
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.
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);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants