Merge pull request #2783 from alihanozturk/master

jasper:32bit fix
This commit is contained in:
Alihan Öztürk
2017-02-12 09:39:29 +02:00
committed by GitHub
+4 -3
View File
@@ -15,14 +15,15 @@ def setup():
shelltools.cd("build") shelltools.cd("build")
if get.buildTYPE() != "emul32": if get.buildTYPE() != "emul32":
options = "-DCMAKE_INSTALL_PREFIX=/usr" options = "-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib"
if get.buildTYPE() == "emul32": if get.buildTYPE() == "emul32":
options = "-DCMAKE_INSTALL_PREFIX=/emul32/lib32" options = "-DCMAKE_INSTALL_PREFIX=/emul32 \
-DCMAKE_INSTALL_LIBDIR=lib32"
cmaketools.configure("-DCMAKE_BUILD_TYPE=Release \ cmaketools.configure("-DCMAKE_BUILD_TYPE=Release \
%s \ %s \
-DCMAKE_INSTALL_LIBDIR=lib \
-DALLOW_IN_SOURCE_BUILD=ON \ -DALLOW_IN_SOURCE_BUILD=ON \
-DCMAKE_SKIP_INSTALL_RPATH=YES" % options, sourceDir=".." ) -DCMAKE_SKIP_INSTALL_RPATH=YES" % options, sourceDir=".." )