search

OpenMS / contrib

Automated CMake build scripts for the OpenMS contrib libraries
Other
0 stars 21 forks source link

Only add architecture option if not a Win64 Generator #97

Closed jpfeuffer closed 4 years ago

jpfeuffer commented 4 years ago

Should fix #95 One win machine had a git update which removed it from the path. IT needs to fix it. We test it here with -G "Visual Studio X Y" -A x64. So it should be confirmed by someone else. I tested it quickly with -G "Visual Studio X Y Win64" though and it worked now. When manually running the libraries after our Script configured them, they reported "Generator ... Win64 does not support platform specification". So it seems like you cannot specify both (which we did for the subcalls).

jpfeuffer commented 4 years ago

@hroest Maybe you can test it. Everyone I asked, has VS 2019. Which you probably also should upgrade to, when you find the time since otherwise OpenMP is broken.

hroest commented 4 years ago

@hroest Maybe you can test it. Everyone I asked, has VS 2019. Which you probably also should upgrade to, when you find the time since otherwise OpenMP is broken.

we cannot since we need to build pyOpenMS which requires 14.x https://wiki.python.org/moin/WindowsCompilers -- but we do compile without OpenMP

jpfeuffer commented 4 years ago

VS 2019 is 14.2. Since 2015 the runtime is unified and backwards compatible. But if you compile without OpenMP it won't make a difference indeed ;)

hroest commented 4 years ago

VS 2019 is 14.2. Since 2015 the runtime is unified and backwards compatible.

ok, I did not know that! I guess I will try it out, thanks.

@hroest Maybe you can test it

testing it right now, it seems to work for HDF5, but I will also run for all contrib packages

jpfeuffer commented 4 years ago

Great thank you! let me know. Then I will accept your change and merge.

hroest commented 4 years ago

yes, it works now on my machine. Feel free to merge