mirror of https://git.wownero.com/dsc/mxe.git
itpp: various fixups
Replaces #1742 with various fixups - remove extraneous wget change in main Makefile - disable docs - enable shared/static - fix blas/lapack libs - install pc file - build test
This commit is contained in:
parent
58b678392f
commit
4df513e531
|
@ -0,0 +1,23 @@
|
|||
This file is part of MXE. See LICENSE.md for licensing information.
|
||||
|
||||
Contains ad hoc patches for cross building.
|
||||
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Tony Theodore <tonyt@logyst.com>
|
||||
Date: Wed, 1 Nov 2017 19:30:10 +1100
|
||||
Subject: [PATCH] install pc files etc. on mingw
|
||||
|
||||
|
||||
diff --git a/itpp/CMakeLists.txt b/itpp/CMakeLists.txt
|
||||
index 1111111..2222222 100644
|
||||
--- a/itpp/CMakeLists.txt
|
||||
+++ b/itpp/CMakeLists.txt
|
||||
@@ -101,7 +101,7 @@ if (HTML_DOCS AND DOXYGEN_FOUND)
|
||||
endif()
|
||||
|
||||
#itpp-config script for UNIX-like systems
|
||||
-if (UNIX)
|
||||
+if (UNIX OR MINGW)
|
||||
if (ITPP_LIBS)
|
||||
string (REPLACE ";" " " ITPP_LIBS "${ITPP_LIBS}")
|
||||
endif()
|
16
src/itpp.mk
16
src/itpp.mk
|
@ -17,11 +17,17 @@ define $(PKG)_UPDATE
|
|||
endef
|
||||
|
||||
define $(PKG)_BUILD
|
||||
cd '$(BUILD_DIR)' && '$(TARGET)-cmake' \
|
||||
-DCMAKE_INSTALL_PREFIX:STRING="lib/itpp" \
|
||||
-DBLAS_LIBRARIES=libblas.dll \
|
||||
'$(SOURCE_DIR)'
|
||||
|
||||
cd '$(BUILD_DIR)' && '$(TARGET)-cmake' '$(SOURCE_DIR)' \
|
||||
-DITPP_SHARED_LIB=$(CMAKE_SHARED_BOOL) \
|
||||
-DHTML_DOCS=OFF \
|
||||
-DBLAS_LIBRARIES=-lblas \
|
||||
-DLAPACK_LIBRARIES='-llapack -lgfortran -lquadmath'
|
||||
$(MAKE) -C '$(BUILD_DIR)' -j $(JOBS)
|
||||
$(MAKE) -C '$(BUILD_DIR)' -j 1 install
|
||||
|
||||
# compile test
|
||||
'$(TARGET)-g++' \
|
||||
-W -Wall -pedantic \
|
||||
'$(SOURCE_DIR)/tests/array_test.cpp' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
|
||||
`'$(TARGET)-pkg-config' $(PKG) --cflags --libs`
|
||||
endef
|
||||
|
|
Loading…
Reference in New Issue