diff --git a/util/cmk b/util/cmk index 491a85f..364d114 100755 --- a/util/cmk +++ b/util/cmk @@ -46,7 +46,7 @@ CMAKE_PREFIX_PATH = None #CMAKE_PREFIX_PATH = "/home/cary/builds/releases/openexr-3.2.0-Release/install/lib/cmake" #CMAKE_PREFIX_PATH = "/home/cary/builds/src/cary-ilm/Imath/fix_export_setting-Release/install" #CMAKE_PREFIX_PATH = "/home/cary/builds/src/cary-ilm/Imath/main-Release/install" -#CMAKE_PREFIX_PATH = "/home/cary/builds/src/cary-ilm/Imath/main-Release/install:/home/cary/builds/src/ebiggers/libdeflate/master-Release/install/lib" +CMAKE_PREFIX_PATH = "/Users/cary/builds/src/cary-ilm/Imath/main-Release/install:/Users/cary/builds/src/ebiggers/libdeflate/master-Release/install/lib" #CMAKE_PREFIX_PATH = "/home/cary/builds/src/ebiggers/libdeflate/master-Release/install/lib" CMAKE_CXX_COMPILER = "g++-12" @@ -62,6 +62,7 @@ CMAKE_C_COMPILER = "gcc-11" CMAKE_C_FLAGS = "" CMAKE_TOOLCHAIN_FILE=None OPENEXR_FORCE_INTERNAL_DEFLATE=None +OPENEXR_FORCE_INTERNAL_IMATH=None OPENEXR_IMAGES_REPO="file:///home/cary/src/AcademySoftwareFoundation/openexr-images" #OPENEXR_IMAGES_REPO="file:///home/cary/src/AcademySoftwareFoundation/openexr-images.git" OPENEXR_IMAGES_TAG="v1.0" @@ -163,6 +164,8 @@ for arg in sys.argv[1:]: BUILD_TESTING = 0 elif arg == "deflate": OPENEXR_FORCE_INTERNAL_DEFLATE = True + elif arg == "imath": + OPENEXR_FORCE_INTERNAL_IMATH = True elif arg == "aarch64": CMAKE_TOOLCHAIN_FILE = "cross-compilation-aarch64.cmake" CMAKE_C_COMPILER = "aarch64-linux-gnu-gcc" @@ -267,8 +270,15 @@ if CMAKE_TOOLCHAIN_FILE: if cmd == "cmake": - args = " ".join (args) - cmd = "%s %s %s" % (cmake_bin, SRC_DIR, args) + print(f"joining: {args}") + + args_quoted = "" + for a in args: + args_quoted += f' "{a}"' +# args = " ".join (args) +# cmd = "%s -S %s -B {build} %s" % (cmake_bin, SRC_DIR, args_quoted) + cmd = f"{cmake_bin} -S {SRC_DIR} -B {build} {args_quoted}" + print(f"joined: {cmd}") if CMAKE_PREFIX_PATH: cmd += " -DCMAKE_PREFIX_PATH=%s" % CMAKE_PREFIX_PATH cmd += " -DCMAKE_BUILD_TYPE=%s" % CMAKE_BUILD_TYPE @@ -289,6 +299,8 @@ if cmd == "cmake": cmd += " -DOPENEXR_FORCE_INTERNAL_DEFLATE='ON'" if OPENEXR_FORCE_INTERNAL_DEFLATE: cmd += " -DOPENEXR_FORCE_INTERNAL_DEFLATE='ON'" + if OPENEXR_FORCE_INTERNAL_IMATH: + cmd += " -DOPENEXR_FORCE_INTERNAL_IMATH='ON'" cmd += " -DPYTHON=%s " % PYTHON cmd += " -DUSE_PYTHON2=%s " % USE_PYTHON2 cmd += " -DBUILD_DOCS=%s " % BUILD_DOCS