From f1dd70802a4e20c0f8c849aa44f24651895c7cfc Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Thu, 8 Oct 2015 09:18:47 +1100 Subject: boost pthreads qt sdl: disable cmake tests see #909 --- src/boost.mk | 3 ++- src/pthreads.mk | 3 ++- src/qt.mk | 3 ++- src/sdl.mk | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/boost.mk b/src/boost.mk index 1d3c060..b4fc4ac 100644 --- a/src/boost.mk +++ b/src/boost.mk @@ -73,10 +73,11 @@ define $(PKG)_BUILD -lboost_chrono-mt # test cmake + $(and $(ENABLE_CMAKE_TESTS), mkdir '$(1).test-cmake' cd '$(1).test-cmake' && '$(TARGET)-cmake' \ -DPKG=$(PKG) \ -DPKG_VERSION=$($(PKG)_VERSION) \ '$(PWD)/src/cmake/test' - $(MAKE) -C '$(1).test-cmake' -j 1 install + $(MAKE) -C '$(1).test-cmake' -j 1 install) endef diff --git a/src/pthreads.mk b/src/pthreads.mk index 827cce8..5e63def 100644 --- a/src/pthreads.mk +++ b/src/pthreads.mk @@ -27,9 +27,10 @@ define PTHREADS_TEST `'$(TARGET)-pkg-config' --libs pthreads` # test cmake + $(and $(ENABLE_CMAKE_TESTS), mkdir '$(1).test-cmake' cd '$(1).test-cmake' && '$(TARGET)-cmake' \ -DPKG=$(PKG) \ '$(PWD)/src/cmake/test' - $(MAKE) -C '$(1).test-cmake' -j 1 install + $(MAKE) -C '$(1).test-cmake' -j 1 install) endef diff --git a/src/qt.mk b/src/qt.mk index 71536fe..5f953f5 100644 --- a/src/qt.mk +++ b/src/qt.mk @@ -127,12 +127,13 @@ define $(PKG)_BUILD echo 'set(MNG_LIBRARY mng lcms2 lzma)' >> '$(CMAKE_TOOLCHAIN_DIR)/$(PKG).cmake' # test cmake + $(and $(ENABLE_CMAKE_TESTS), mkdir '$(1).test-cmake' cd '$(1).test-cmake' && '$(TARGET)-cmake' \ -DPKG=$(PKG) \ -DPKG_VERSION=$($(PKG)_VERSION) \ '$(PWD)/src/cmake/test' - $(MAKE) -C '$(1).test-cmake' -j 1 install + $(MAKE) -C '$(1).test-cmake' -j 1 install) endef $(PKG)_BUILD_SHARED = $(subst -static ,-shared ,\ diff --git a/src/sdl.mk b/src/sdl.mk index d0b033c..2f9bd06 100644 --- a/src/sdl.mk +++ b/src/sdl.mk @@ -35,10 +35,11 @@ define $(PKG)_BUILD `'$(TARGET)-pkg-config' sdl --cflags --libs` # test cmake + $(and $(ENABLE_CMAKE_TESTS), mkdir '$(1).test-cmake' cd '$(1).test-cmake' && '$(TARGET)-cmake' \ -DPKG=$(PKG) \ -DPKG_VERSION=$($(PKG)_VERSION) \ '$(PWD)/src/cmake/test' - $(MAKE) -C '$(1).test-cmake' -j 1 install + $(MAKE) -C '$(1).test-cmake' -j 1 install) endef -- cgit v0.12