Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-25 09:32:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

nix/build-all propagate BUILD_SHARED_LIBS for -shared build

Browse Source
This commit is contained in:
Thomas Krijnen
2024-10-10 09:15:11 +00:00
parent 47f013fc18
commit 766f8adce7
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nix/build-all.py
+2 -2
View File
@@ -220,6 +220,7 @@ if "v" in flags:
else: else:
logger.setLevel(logging.INFO) logger.setLevel(logging.INFO)
OFF_ON = ["OFF", "ON"]
BUILD_STATIC = "shared" not in flags BUILD_STATIC = "shared" not in flags
ENABLE_FLAG = "--enable-static" if BUILD_STATIC else "--enable-shared" ENABLE_FLAG = "--enable-static" if BUILD_STATIC else "--enable-shared"
DISABLE_FLAG = "--disable-shared" if BUILD_STATIC else "--disable-static" DISABLE_FLAG = "--disable-shared" if BUILD_STATIC else "--disable-static"
@@ -331,7 +332,7 @@ def run_cmake(arg1, cmake_args, cmake_dir=None, cwd=None):
if "wasm" in flags: if "wasm" in flags:
wasm.append("emcmake") wasm.append("emcmake")
run([*wasm, "cmake", P, *cmake_args, f"-DCMAKE_BUILD_TYPE={BUILD_CFG}"], cwd=cwd) run([*wasm, "cmake", P, *cmake_args, f"-DCMAKE_BUILD_TYPE={BUILD_CFG}", f"-DBUILD_SHARED_LIBS={OFF_ON[not BUILD_STATIC]}"], cwd=cwd)
def git_clone_or_pull_repository(clone_url, target_dir, revision=None): def git_clone_or_pull_repository(clone_url, target_dir, revision=None):
@@ -829,7 +830,6 @@ os.makedirs(IFCOS_DIR, exist_ok=True)
executables_dir = os.path.join(IFCOS_DIR, "executables") executables_dir = os.path.join(IFCOS_DIR, "executables")
os.makedirs(executables_dir, exist_ok=True) os.makedirs(executables_dir, exist_ok=True)
OFF_ON = ["OFF", "ON"]
cmake_args = [ cmake_args = [
"-DUSE_MMAP=" "OFF", "-DUSE_MMAP=" "OFF",