diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2024-06-12 11:19:31 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2024-06-12 11:19:48 +0300 |
| commit | 7228cc9e9c23377b701c9906314f3654e13e439e (patch) | |
| tree | 9fc3f96233caf2f8aba4e7254c1b5c98a98f5090 | |
| parent | a5c1317d86c5338843a815d4bf547a0394635d5e (diff) | |
Don't set cxx.importable variable and don't refer to hbmis/hbmia targets in buildfiles.
| -rw-r--r-- | libformat/build/root.build | 4 | ||||
| -rw-r--r-- | libformat/libformat/buildfile | 12 | ||||
| -rw-r--r-- | libformat/manifest | 2 | ||||
| -rw-r--r-- | libformat/tests/build/root.build | 4 |
4 files changed, 6 insertions, 16 deletions
diff --git a/libformat/build/root.build b/libformat/build/root.build index ae3d2a6..21e0a2e 100644 --- a/libformat/build/root.build +++ b/libformat/build/root.build @@ -11,10 +11,6 @@ ixx{*}: extension = ixx txx{*}: extension = txx cxx{*}: extension = cxx -# Assume headers are importable unless stated otherwise. -# -hxx{*}: cxx.importable = true - # The test target for cross-testing (running tests under Wine, etc). # test.target = $cxx.target diff --git a/libformat/libformat/buildfile b/libformat/libformat/buildfile index 814ee33..4d54b4f 100644 --- a/libformat/libformat/buildfile +++ b/libformat/libformat/buildfile @@ -6,14 +6,12 @@ lib{format}: {hxx ixx txx cxx}{** -version} hxx{version} $impl_libs $intf_libs hxx{version}: in{version} $src_root/manifest -hxx{export}@./: cxx.importable = false - # Build options. # cxx.poptions =+ "-I$out_root" "-I$src_root" -{hbmia obja}{*}: cxx.poptions += -DLIBFORMAT_STATIC_BUILD -{hbmis objs}{*}: cxx.poptions += -DLIBFORMAT_SHARED_BUILD +obja{*}: cxx.poptions += -DLIBFORMAT_STATIC_BUILD +objs{*}: cxx.poptions += -DLIBFORMAT_SHARED_BUILD # Export options. # @@ -26,9 +24,9 @@ lib{format}: liba{format}: cxx.export.poptions += -DLIBFORMAT_STATIC libs{format}: cxx.export.poptions += -DLIBFORMAT_SHARED -# For pre-releases use the complete version to make sure they cannot be used -# in place of another pre-release or the final version. See the version module -# for details on the version.* variable values. +# For pre-releases use the complete version to make sure they cannot +# be used in place of another pre-release or the final version. See +# the version module for details on the version.* variable values. # if $version.pre_release lib{format}: bin.lib.version = "-$version.project_id" diff --git a/libformat/manifest b/libformat/manifest index c3dfe80..a75cef1 100644 --- a/libformat/manifest +++ b/libformat/manifest @@ -1,6 +1,6 @@ : 1 name: libformat -version: 1.0.0+11 +version: 1.0.0+12 language: c++ project: hello summary: The "Hello World" example formatter library diff --git a/libformat/tests/build/root.build b/libformat/tests/build/root.build index 8fafbfe..a67b2fe 100644 --- a/libformat/tests/build/root.build +++ b/libformat/tests/build/root.build @@ -7,10 +7,6 @@ ixx{*}: extension = ixx txx{*}: extension = txx cxx{*}: extension = cxx -# Assume headers are importable unless stated otherwise. -# -hxx{*}: cxx.importable = true - # Every exe{} in this subproject is by default a test. # exe{*}: test = true |