diff options
| author | Tony Theodore <tonyt@logyst.com> | 2015-10-17 00:53:28 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2015-10-17 00:53:28 (GMT) |
| commit | d08148a0da54811afb71c767dc4b6f225f038917 (patch) | |
| tree | b6d0c54663784746ca63104c199f47861468441b | |
| parent | 08d7f265a10ef6eac0041f38a477ea3c6ce5e1e5 (diff) | |
| download | mxe-d08148a0da54811afb71c767dc4b6f225f038917.zip mxe-d08148a0da54811afb71c767dc4b6f225f038917.tar.gz mxe-d08148a0da54811afb71c767dc4b6f225f038917.tar.bz2 | |
Revert "boost pthreads qt sdl: disable cmake tests"
This reverts commit f1dd70802a4e20c0f8c849aa44f24651895c7cfc.
| -rw-r--r-- | src/boost.mk | 3 | ||||
| -rw-r--r-- | src/pthreads.mk | 3 | ||||
| -rw-r--r-- | src/qt.mk | 3 | ||||
| -rw-r--r-- | src/sdl.mk | 3 |
4 files changed, 4 insertions, 8 deletions
diff --git a/src/boost.mk b/src/boost.mk index b4fc4ac..1d3c060 100644 --- a/src/boost.mk +++ b/src/boost.mk @@ -73,11 +73,10 @@ 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 5e63def..827cce8 100644 --- a/src/pthreads.mk +++ b/src/pthreads.mk @@ -27,10 +27,9 @@ 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 @@ -127,13 +127,12 @@ 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 ,\ @@ -35,11 +35,10 @@ 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 |