summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTony Theodore <tonyt@logyst.com>2016-05-07 05:09:33 (GMT)
committerTony Theodore <tonyt@logyst.com>2016-05-07 05:09:33 (GMT)
commit2da963029acd41d12dc2cb86a7d5ebe5f5f6cb8c (patch)
treec4947f0fa020acb53b320709b5ad074c2f0aad16 /src
parenta742eed04ae494419c9509d41ec0af0675b81229 (diff)
parent3e39ece1a7d459761ba4fc302b8ec20aa5d4185f (diff)
downloadmxe-2da963029acd41d12dc2cb86a7d5ebe5f5f6cb8c.zip
mxe-2da963029acd41d12dc2cb86a7d5ebe5f5f6cb8c.tar.gz
mxe-2da963029acd41d12dc2cb86a7d5ebe5f5f6cb8c.tar.bz2
Merge pull request #1339 from TobiX/jsoncpp-with-cmake
jsoncpp: Build & install cmake files
Diffstat (limited to 'src')
-rw-r--r--src/jsoncpp.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/jsoncpp.mk b/src/jsoncpp.mk
index f7ef89a..493b34b 100644
--- a/src/jsoncpp.mk
+++ b/src/jsoncpp.mk
@@ -26,6 +26,7 @@ define $(PKG)_BUILD
-DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
-DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF \
-DCMAKE_CXX_FLAGS="$($(PKG)_CXXFLAGS)" \
+ -DJSONCPP_WITH_CMAKE_PACKAGE=ON \
-DBUILD_STATIC_LIBS=$(if $(BUILD_STATIC),true,false) \
-DBUILD_SHARED_LIBS=$(if $(BUILD_STATIC),false,true)
$(MAKE) -C '$(1)/build' -j '$(JOBS)' install