diff options
| author | Tony Theodore <tonyt@logyst.com> | 2017-02-04 06:58:04 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2017-03-12 06:30:18 (GMT) |
| commit | 24d37efa5dae04fbe143c33b8c6710a8606c5451 (patch) | |
| tree | e3b298caf09d415400c9b7fab24ed7befe2fec1e /Makefile | |
| parent | 5780100e32ff9c0d04165ee82744b19a6e6676db (diff) | |
| download | mxe-24d37efa5dae04fbe143c33b8c6710a8606c5451.zip mxe-24d37efa5dae04fbe143c33b8c6710a8606c5451.tar.gz mxe-24d37efa5dae04fbe143c33b8c6710a8606c5451.tar.bz2 | |
cmake: improve configuration with templates
- move cmake configuration from mxe-conf to cmake-conf
- replace `echo` with templates for readability and maintenance
- allow packages to set other dep files
- set CMAKE_POLICY_DEFAULT_CMPNNNN in wrapper since
`cmake_minimum_required` or `cmake_policy` can't be set in
toolchain (closes #971)
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -61,7 +61,7 @@ STRIP_EXE := $(true) # All pkgs have (implied) order-only dependencies on MXE_CONF_PKGS. # These aren't meaningful to the pkg list in http://mxe.cc/#packages so # use a list in case we want to separate autotools, cmake etc. -MXE_CONF_PKGS := mxe-conf +MXE_CONF_PKGS := cmake-conf mxe-conf # define some whitespace variables define newline @@ -525,6 +525,7 @@ $(1): $(PREFIX)/$(3)/installed/$(1) $(PREFIX)/$(3)/installed/$(1): $(PKG_MAKEFILES) \ $(PKG_PATCHES) \ $(PKG_TESTFILES) \ + $($(1)_FILE_DEPS) \ $(addprefix $(PREFIX)/$(3)/installed/,$(value $(call LOOKUP_PKG_RULE,$(1),DEPS,$(3)))) \ $(and $($(3)_DEPS),$(addprefix $(PREFIX)/$($(3)_DEPS)/installed/,$(filter-out $(MXE_CONF_PKGS),$($($(3)_DEPS)_PKGS)))) \ | $(if $(DONT_CHECK_REQUIREMENTS),,check-requirements) \ |