diff options
| author | Boris Nagaev <bnagaev@gmail.com> | 2016-10-18 23:29:33 (GMT) |
|---|---|---|
| committer | Boris Nagaev <bnagaev@gmail.com> | 2017-01-08 02:01:54 (GMT) |
| commit | e2fd9fe23a4a883586dbe4596352784a16cb1c5d (patch) | |
| tree | a1ecd72bf6b042b281d65a1a61c6ec3125e2feca /src/armadillo.mk | |
| parent | 0555e10e6f85e6066b6b210a23843967c8d4b394 (diff) | |
| download | mxe-e2fd9fe23a4a883586dbe4596352784a16cb1c5d.zip mxe-e2fd9fe23a4a883586dbe4596352784a16cb1c5d.tar.gz mxe-e2fd9fe23a4a883586dbe4596352784a16cb1c5d.tar.bz2 | |
use cmake wrapper in all packages
Native binaries (libmysqlclient, vtk, vtk6) still build with `cmake`
instead of the cmake wrapper. Note that even in these cases MXE's cmake
is used (not system cmake), because $(PREFIX)/$(BUILD)/bin is added to
PATH by Makefile and MXE's cmake binary exists there.
Diffstat (limited to 'src/armadillo.mk')
| -rw-r--r-- | src/armadillo.mk | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/armadillo.mk b/src/armadillo.mk index cd6ac1d..1c8a3fe 100644 --- a/src/armadillo.mk +++ b/src/armadillo.mk @@ -19,9 +19,7 @@ endef define $(PKG)_BUILD mkdir '$(1)/build' - cd '$(1)/build' && cmake .. \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ - -DBUILD_SHARED_LIBS=$(if $(BUILD_SHARED),YES,NO) \ + cd '$(1)/build' && '$(TARGET)-cmake' .. \ -DARMA_USE_WRAPPER=false $(MAKE) -C '$(1)/build' -j '$(JOBS)' install VERBOSE=1 |