Merge pull request #2783 from alihanozturk/master

jasper:32bit fix
2017-02-12 09:39:29 +02:00
parent c7bea0d45f 46d7a338a0
commit 76b73b5a64
1 changed files with 4 additions and 3 deletions
@@ -15,14 +15,15 @@ def setup():
    shelltools.cd("build")
    
    if get.buildTYPE() != "emul32":
-        options = "-DCMAKE_INSTALL_PREFIX=/usr"
+        options = "-DCMAKE_INSTALL_PREFIX=/usr \
+                   -DCMAKE_INSTALL_LIBDIR=lib"
    
    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 \
                                        %s \
-                          -DCMAKE_INSTALL_LIBDIR=lib     \
                          -DALLOW_IN_SOURCE_BUILD=ON     \
                          -DCMAKE_SKIP_INSTALL_RPATH=YES" % options, sourceDir=".." )