Merge branch 'macos' of github.com:QuantumPackage/qp2 into macos

bin/zcat

@@ -17,6 +17,6 @@ EOF
    fi
 else
    command=$(which -a zcat | grep -v 'qp2/bin/' | head -1)
-   exec command
+   exec $command $@
 fi
 

configure

@@ -226,7 +226,7 @@ EOF
               cd "\${QP_ROOT}"/external
               tar --gunzip --extract --file qp2-dependencies/zeromq-4.2.5.tar.gz
               cd zeromq-*
-              [[ ${SYSTEM} = Darwin ]] && ./autogen.sh
+              [[ "${SYSTEM}" = "Darwin" ]] && ./autogen.sh
               ./configure --prefix="\$QP_ROOT" --without-libsodium --enable-libunwind=no
               make -j 8
               make install

scripts/compilation/qp_create_ninja

@@ -40,7 +40,7 @@ from qp_path import QP_ROOT, QP_SRC, QP_EZFIO
 
 LIB = " -lz"
 EZFIO_LIB = join("$QP_ROOT", "lib", "libezfio_irp.a")
-ZMQ_LIB = "-lzmq -lf77zmq"
+ZMQ_LIB = "-lf77zmq -lzmq"
 #ZMQ_LIB = join("$QP_ROOT", "lib", "libf77zmq.a") + " "  + join("$QP_ROOT", "lib", "libzmq.a") + " -lstdc++ -lrt -ldl"
 ROOT_BUILD_NINJA = join("$QP_ROOT", "config", "build.ninja")
 ROOT_BUILD_NINJA_EXP =  join(QP_ROOT, "config", "build.ninja")

scripts/module/create_executables_list.sh

@@ -11,7 +11,11 @@ fi
 
 cd ${QP_ROOT}/data
 rm -f executables
+if [[ "$(uname -s)" = "Darwin" ]] ; then
 EXES=$(find -L ${QP_ROOT}/src -maxdepth 2 -depth -perm +111 -type f | grep -e "${QP_ROOT}/src/[^/]*/[^/]*$" |sort ) 
+else
+EXES=$(find -L ${QP_ROOT}/src -maxdepth 2 -depth -executable -type f | grep -e "${QP_ROOT}/src/[^/]*/[^/]*$" |sort ) 
+fi
 
 for EXE in $EXES
 do