diff options
| -rw-r--r-- | libhello/manifest | 8 | ||||
| -rw-r--r-- | libmhello/libmhello/buildfile | 11 | ||||
| -rw-r--r-- | libmhello/manifest | 15 |
3 files changed, 16 insertions, 18 deletions
diff --git a/libhello/manifest b/libhello/manifest index 42eed6d..4227527 100644 --- a/libhello/manifest +++ b/libhello/manifest @@ -1,6 +1,6 @@ : 1 name: libhello -version: 1.1.0+1 +version: 1.1.0+2 project: hello summary: The "Hello World" example library license: MIT @@ -13,8 +13,8 @@ url: https://git.build2.org/cgit/hello/libhello src-url: https://git.build2.org/cgit/hello/libhello/tree/libhello email: users@build2.org build-email: builds@build2.org -#builds: all -depends: * build2 >= 0.8.0- -depends: * bpkg >= 0.8.0- +builds: all +depends: * build2 >= 0.9.0 +depends: * bpkg >= 0.9.0 depends: libformat ^1.0.0 depends: libprint ^1.0.0 diff --git a/libmhello/libmhello/buildfile b/libmhello/libmhello/buildfile index c33ca6b..2820bb2 100644 --- a/libmhello/libmhello/buildfile +++ b/libmhello/libmhello/buildfile @@ -4,16 +4,19 @@ import imp_libs = libmprint%lib{mprint} lib{mhello}: {mxx cxx}{hello} $imp_libs $int_libs +# Export options. +# +lib{mhello}: cxx.export.libs = $int_libs + # For pre-releases use the complete version to make sure they cannot be used -# in place of another pre-release or the final version. +# 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{mhello}: bin.lib.version = @"-$version.project_id" else lib{mhello}: bin.lib.version = @"-$version.major.$version.minor" -lib{mhello}: cxx.export.libs = $int_libs - # Install into the libmhello/ subdirectory of, say, /usr/include/. # -mxx{*}: install = include/$project/ +mxx{*}: install = include/libmhello/ diff --git a/libmhello/manifest b/libmhello/manifest index 792c36e..acbb65d 100644 --- a/libmhello/manifest +++ b/libmhello/manifest @@ -13,20 +13,15 @@ url: https://git.build2.org/cgit/hello/libhello src-url: https://git.build2.org/cgit/hello/libhello/tree/libmhello email: users@build2.org build-email: builds@build2.org -#builds: all -#build-exclude: *-msvc_15u0** ; Broken C++ modules support. -#build-include: *-msvc_15u** -#build-include: *-clang_5.** -#build-include: *-clang_6.** -#build-exclude: ** ; Requires C++ modules support. -build-exclude: *-msvc_15u0** ; Broken C++ modules support. -build-include: *-msvc_15u** +builds: all +build-exclude: *-msvc_15.0** ; Broken C++ modules support. +build-include: *-msvc_15.** build-include: *-clang_5.** build-include: *-clang_6.** build-exclude: ** ; Requires C++ modules support. requires: c++20 -depends: * build2 >= 0.8.0- -depends: * bpkg >= 0.8.0- +depends: * build2 >= 0.9.0 +depends: * bpkg >= 0.9.0 depends: libstd-modules depends: libmformat [1.0.0 2.0.0-) ; Compatible with libmformat-1.X.Y. depends: libmprint [1.0.0 2.0.0-) ; Compatible with libmprint-1.X.Y. |