diff --git a/quick_compile.bat b/quick_compile.bat index d7767b1..75e9379 100644 --- a/quick_compile.bat +++ b/quick_compile.bat @@ -15,7 +15,7 @@ if not exist %BUILDDIR%\ ( if exist %BUILDDIR%\ ( meson compile -C %BUILDDIR% - meson install -C %BUILDDIR% + meson install --skip-subprojects -C %BUILDDIR% ) pause diff --git a/src/maya/meson.build b/src/maya/meson.build index 1bd14ab..54c308f 100644 --- a/src/maya/meson.build +++ b/src/maya/meson.build @@ -31,7 +31,7 @@ simplex_maya = shared_library( install: true, install_dir : meson.global_source_root() / 'output_Maya' + maya_version, include_directories : simplex_maya_inc, - dependencies : [maya_dep, simplexlib_dep, rapidjson_dep], + dependencies : [maya_dep, simplexlib_dep], name_prefix : '', name_suffix : maya_name_suffix, ) diff --git a/src/python/meson.build b/src/python/meson.build index df358d4..f575680 100644 --- a/src/python/meson.build +++ b/src/python/meson.build @@ -13,7 +13,7 @@ endif simplex_python = py_inst.extension_module( 'simplex_python', simplex_python_files, - dependencies : [simplexlib_dep, rapidjson_dep], + dependencies : simplexlib_dep, install: true, install_dir : meson.global_source_root() / 'output_Python', limited_api : lapi, diff --git a/src/simplexlib/meson.build b/src/simplexlib/meson.build index f22327c..24349f8 100644 --- a/src/simplexlib/meson.build +++ b/src/simplexlib/meson.build @@ -12,19 +12,10 @@ simplexlib_files = files([ rapidjson_dep = dependency('rapidjson') eigen_dep = dependency('eigen3') -inc = include_directories(['include']) - -simplexlib = static_library( - 'simplexlib', - simplexlib_files, - include_directories : inc, - dependencies : [ - rapidjson_dep, - eigen_dep, - ] -) +simplexlib_inc = include_directories(['include']) simplexlib_dep = declare_dependency( - include_directories : inc, - link_with : simplexlib, + include_directories : simplexlib_inc, + sources : simplexlib_files, + dependencies : [eigen_dep, rapidjson_dep], ) diff --git a/subprojects/maya/meson.build b/subprojects/maya/meson.build index 43caa6f..65df36e 100644 --- a/subprojects/maya/meson.build +++ b/subprojects/maya/meson.build @@ -27,14 +27,14 @@ elif os_name == 'darwin' endif maya_compile_args += ['-DOSMac_'] if meson.get_compiler('cpp').get_id() == 'clang' - maya_compile_args += ['--std', 'c++17', '--stdlib', 'libc++'] + maya_compile_args += ['--stdlib', 'libc++'] maya_compile_args += ['-arch', 'x86_64'] maya_link_args += ['-arch', 'x86_64'] if maya_version.version_compare('>=2024') - # build both the arm and x86 plugins when compiling for mac + # clang will build for both x86 and arm + # if both arches are in the command line args maya_compile_args += ['-arch', 'arm64'] maya_link_args += ['-arch', 'arm64'] - else endif endif @@ -101,7 +101,6 @@ maya_dep = declare_dependency( variables : {'name_suffix' : maya_plugin_ext, 'maya_version' : maya_version}, compile_args : maya_compile_args, link_args : maya_link_args, - ) meson.override_dependency('maya', maya_dep)