diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2024-06-12 10:46:38 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2024-06-12 10:47:06 +0300 |
| commit | 45fe812417c0a60f33029d2280e4970a62a7f28f (patch) | |
| tree | e0557a0fd9cbe81bc5d191ba8254cd0ca7eb8cf8 | |
| parent | 143398e35b2e3ee03be221e76ef77a742195e0aa (diff) | |
Don't set cxx.importable variable and don't refer to hbmis/hbmia targets in buildfiles.
| -rw-r--r-- | libhello/build/root.build | 4 | ||||
| -rw-r--r-- | libhello/libhello/buildfile | 12 | ||||
| -rw-r--r-- | libhello/manifest | 2 | ||||
| -rw-r--r-- | libhello/tests/build/root.build | 4 |
4 files changed, 6 insertions, 16 deletions
diff --git a/libhello/build/root.build b/libhello/build/root.build index ae3d2a6..21e0a2e 100644 --- a/libhello/build/root.build +++ b/libhello/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/libhello/libhello/buildfile b/libhello/libhello/buildfile index d0cdbe3..cb30e36 100644 --- a/libhello/libhello/buildfile +++ b/libhello/libhello/buildfile @@ -6,14 +6,12 @@ lib{hello}: {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 += -DLIBHELLO_STATIC_BUILD -{hbmis objs}{*}: cxx.poptions += -DLIBHELLO_SHARED_BUILD +obja{*}: cxx.poptions += -DLIBHELLO_STATIC_BUILD +objs{*}: cxx.poptions += -DLIBHELLO_SHARED_BUILD # Export options. # @@ -26,9 +24,9 @@ lib{hello}: liba{hello}: cxx.export.poptions += -DLIBHELLO_STATIC libs{hello}: cxx.export.poptions += -DLIBHELLO_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{hello}: bin.lib.version = "-$version.project_id" diff --git a/libhello/manifest b/libhello/manifest index fa9f855..03b7ede 100644 --- a/libhello/manifest +++ b/libhello/manifest @@ -1,6 +1,6 @@ : 1 name: libhello -version: 1.0.0+11 +version: 1.0.0+12 language: c++ project: hello summary: The "Hello World" example library diff --git a/libhello/tests/build/root.build b/libhello/tests/build/root.build index 8fafbfe..a67b2fe 100644 --- a/libhello/tests/build/root.build +++ b/libhello/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 |