Revert some tmp changes

This commit is contained in:
Thomas Krijnen
2026-04-25 11:13:56 +02:00
parent 1efedfd3cc
commit 40267aa068
3 changed files with 5 additions and 11 deletions
+3 -8
View File
@@ -591,10 +591,6 @@ def run_cmake(arg1, cmake_args: "list[str]", cmake_dir: Union[str, None] = None,
f"-DBUILD_SHARED_LIBS={OFF_ON[not BUILD_STATIC]}",
)
module_flags = []
if "wasm" in flags:
module_flags.append(f"-DCMAKE_MODULE_LINKER_FLAGS={os.environ['LDFLAGS']}")
run(
[
*wasm,
@@ -604,7 +600,6 @@ def run_cmake(arg1, cmake_args: "list[str]", cmake_dir: Union[str, None] = None,
*cmake_args,
f"-DCMAKE_BUILD_TYPE={BUILD_CFG}",
f"-DCMAKE_SHARED_LINKER_FLAGS={os.environ['LDFLAGS']}",
*module_flags
],
cwd=cwd,
)
@@ -1399,9 +1394,9 @@ elif "occ" in targets:
occ_library_dir = f"{DEPS_DIR}/install/oce-{OCE_VERSION}/lib"
cmake_args.extend(["-DOCC_INCLUDE_DIR=" + occ_include_dir, "-DOCC_LIBRARY_DIR=" + occ_library_dir])
# if "manifold" in targets:
# cmake_args_prefix_path.append(f"{DEPS_DIR}/install/manifold-{MANIFOLD_VERSION}")
# cmake_args.append("-DWITH_MANIFOLD=On")
if "manifold" in targets:
cmake_args_prefix_path.append(f"{DEPS_DIR}/install/manifold-{MANIFOLD_VERSION}")
cmake_args.append("-DWITH_MANIFOLD=On")
if "OpenCOLLADA" in targets:
# pcre is a dependency of OpenCOLLADA, but since we `find_package`,
+1 -1
View File
@@ -8,7 +8,7 @@ source:
build:
script: |
CFLAGS="-O0 -g" CXXFLAGS="-O0 -g" LDFLAGS="-O0 -g" IFCOS_SCHEMAS=4 BUILD_CFG=Debug python nix/build-all.py -v --wasm --py313
BUILD_CFG=Release python nix/build-all.py -v --wasm --py313
about:
home: http://ifcopenshell.org
+1 -2
View File
@@ -28,7 +28,7 @@ foreach(kernel ${GEOMETRY_KERNELS})
${KERNEL_TARGET}
PRIVATE "SHELL:-s -s SIDE_MODULE=1"
)
endif()
endif()
set_target_properties(${KERNEL_TARGET} PROPERTIES
COMPILE_FLAGS "-DIFC_GEOMLIBRARY_EXPORTS"
@@ -69,7 +69,6 @@ foreach(kernel ${GEOMETRY_KERNELS})
set(OCCT_LIBS_FILTERED ${OpenCASCADE_LIBRARIES})
list(FILTER OCCT_LIBS_FILTERED EXCLUDE REGEX "(^|;)TKXMesh($|;)")
target_link_libraries(${KERNEL_TARGET} PRIVATE ${OCCT_LIBS_FILTERED})
# message(FATAL_ERROR "OCCT_LIBS_FILTERED ${OCCT_LIBS_FILTERED}")
else()
target_link_libraries(${KERNEL_TARGET} PRIVATE ${OpenCASCADE_LIBRARIES})
endif()