Skip to content

Commit d77c54a

Browse files
committed
Correct check for existing Calculix
1 parent d58a526 commit d77c54a

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

compile_all.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1037,11 +1037,11 @@ def build_opencamlib(self, _: None):
10371037
def build_calculix(self, _: None):
10381038
"""Cannot currently build Calculix (it's in Fortran, and we only support MSVC toolchain right now). Extract
10391039
the relevant files from the downloaded zipfile and copy them"""
1040-
path_to_ccx_bin = os.path.join(os.getcwd(), "CL35-win64", "bin", "ccx", "218")
10411040
if self.skip_existing:
1042-
if os.path.exists(path_to_ccx_bin):
1041+
if os.path.exists(os.path.join(self.install_dir, "bin", "ccx.exe")):
10431042
print(" Not rebuilding Calculix, it is already in the LibPack")
10441043
return
1044+
path_to_ccx_bin = os.path.join(os.getcwd(), "CL35-win64", "bin", "ccx", "218")
10451045
if not os.path.exists(path_to_ccx_bin):
10461046
raise RuntimeError("Could not locate Calculix")
10471047
shutil.copytree(path_to_ccx_bin, os.path.join(self.install_dir, "bin"), dirs_exist_ok=True)

0 commit comments

Comments
 (0)