Integrate more changes from cfcohen.

pull/233/head
Ignacio 7 years ago
parent a20044bccc
commit 9d6c7d6a69
  1. 10
      configure
  2. 2
      src/nvimage/CMakeLists.txt

10
configure vendored

@ -61,15 +61,15 @@ echo ""
cat > Makefile << EOF
all:
@make --no-print-directory -C build-$build/
@+make --no-print-directory -C build-$build/
install:
@make install --no-print-directory -C build-$build/
@+make install --no-print-directory -C build-$build/
package:
@make package --no-print-directory -C build-$build/
@+make package --no-print-directory -C build-$build/
test:
@make test --no-print-directory -C build-$build/
@+make test --no-print-directory -C build-$build/
clean:
@make clean --no-print-directory -C build-$build/
@+make clean --no-print-directory -C build-$build/
distclean:
@rm -Rf build-$build/
EOF

@ -53,7 +53,7 @@ ELSE(NVIMAGE_SHARED)
ADD_LIBRARY(nvimage ${IMAGE_SRCS})
ENDIF(NVIMAGE_SHARED)
TARGET_LINK_LIBRARIES(nvimage ${LIBS} nvcore nvmath posh bc6h bc7)
TARGET_LINK_LIBRARIES(nvimage ${LIBS} nvcore posh bc6h bc7 nvmath)
INSTALL(TARGETS nvimage
RUNTIME DESTINATION bin

Loading…
Cancel
Save