Commit 280045af authored by Giovanni La Mura's avatar Giovanni La Mura
Browse files

Prevent empty INCLUDE and LIBRARY flags in CUDA detection

parent c2ab5706

build/configure

+20 −8
Original line number Diff line number Diff line
@@ -25163,18 +25163,24 @@ then : 
      export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 -I${MAGMA_INCLUDE}"

      export MAGMALDFLAGS="-L${CUDA_LIB} -lcudart -L${MAGMA_LIB} -lmagma"

    else

      if test "x$CUDA_INCLUDE" != "x"; then

        CUDAFLAGS="-I${CUDA_INCLUDE}"

      fi

      if test "x$MAGMA_INCLUDE" != "x"; then

        export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 -I${MAGMA_INCLUDE} -I${CUDA_INCLUDE}"

        export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 -I${MAGMA_INCLUDE} ${CUDAFLAGS}"

      else

        if test -f /usr/include/magma_v2.h; then

          export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 -I${CUDA_INCLUDE}"

          export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 ${CUDAFLAGS}"

	fi

      fi

      if test "x$CUDA_LIB" != "x"; then

        CUDALDFLAGS="-L${CUDA_LIB}"

      fi

      if test "x$MAGMA_LIB" != "x"; then

        export MAGMALDFLAGS="-L${CUDA_LIB} -lcudart -L${MAGMA_LIB} -lmagma"

        export MAGMALDFLAGS="${CUDALDFLAGS} -lcudart -L${MAGMA_LIB} -lmagma"

      else

        if test -f /usr/include/magma_v2.h; then

          export MAGMALDFLAGS="-L${CUDA_LIB} -lcudart -lmagma"

          export MAGMALDFLAGS="${CUDALDFLAGS} -lcudart -lmagma"

	fi

      fi

    fi
@@ -25211,18 +25217,24 @@ else case e in #( 
      export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 -I${MAGMA_INCLUDE}"

      export MAGMALDFLAGS="-L${CUDA_LIB} -lcudart -L${MAGMA_LIB} -lmagma"

    else

      if test "x$CUDA_INCLUDE" != "x"; then

        CUDAFLAGS="-I${CUDA_INCLUDE}"

      fi

      if test "x$MAGMA_INCLUDE" != "x"; then

        export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 -I${MAGMA_INCLUDE} -I${CUDA_INCLUDE}"

        export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 -I${MAGMA_INCLUDE} ${CUDAFLAGS}"

      else

        if test -f /usr/include/magma_v2.h; then

          export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 -I${CUDA_INCLUDE}"

          export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 ${CUDAFLAGS}"

	fi

      fi

      if test "x$CUDA_LIB" != "x"; then

        CUDALDFLAGS="-L${CUDA_LIB}"

      fi

      if test "x$MAGMA_LIB" != "x"; then

        export MAGMALDFLAGS="-L${CUDA_LIB} -lcudart -L${MAGMA_LIB} -lmagma"

        export MAGMALDFLAGS="${CUDALDFLAGS} -lcudart -L${MAGMA_LIB} -lmagma"

      else

        if test -f /usr/include/magma_v2.h; then

          export MAGMALDFLAGS="-L${CUDA_LIB} -lcudart -lmagma"

          export MAGMALDFLAGS="${CUDALDFLAGS} -lcudart -lmagma"

	fi

      fi

    fi

build/configure.ac

+10 −4
Original line number Diff line number Diff line
@@ -51,18 +51,24 @@ m4_define( 
      export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 -I${MAGMA_INCLUDE}"

      export MAGMALDFLAGS="-L${CUDA_LIB} -lcudart -L${MAGMA_LIB} -lmagma"

    else

      if test "x$CUDA_INCLUDE" != "x"; then

        CUDAFLAGS="-I${CUDA_INCLUDE}"

      fi

      if test "x$MAGMA_INCLUDE" != "x"; then

        export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 -I${MAGMA_INCLUDE} -I${CUDA_INCLUDE}"

        export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 -I${MAGMA_INCLUDE} ${CUDAFLAGS}"

      else

        if test -f /usr/include/magma_v2.h; then

          export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 -I${CUDA_INCLUDE}"

          export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 ${CUDAFLAGS}"

	fi

      fi

      if test "x$CUDA_LIB" != "x"; then

        CUDALDFLAGS="-L${CUDA_LIB}"

      fi

      if test "x$MAGMA_LIB" != "x"; then

        export MAGMALDFLAGS="-L${CUDA_LIB} -lcudart -L${MAGMA_LIB} -lmagma"

        export MAGMALDFLAGS="${CUDALDFLAGS} -lcudart -L${MAGMA_LIB} -lmagma"

      else

        if test -f /usr/include/magma_v2.h; then

          export MAGMALDFLAGS="-L${CUDA_LIB} -lcudart -lmagma"

          export MAGMALDFLAGS="${CUDALDFLAGS} -lcudart -lmagma"

	fi

      fi

    fi