[makefile] refs fibercrypto#38 Define CMAKE_INSTALL_PREFIX in windows

simelo · Jun 17, 2019 · 4d996c0 · 4d996c0
1 parent c2267dc
commit 4d996c0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,6 +11,8 @@ matrix:
     # - os: osx
       # osx_image: xcode8.3
     - os: windows
+      env:
+        - CMAKE_INSTALL_PREFIX: /usr/bin
 before_install:
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
     sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test && sudo apt-get update -qq;

diff --git a/Makefile b/Makefile
@@ -208,13 +208,10 @@ install-deps-libc-Darwin: configure-build ## Install locally dependencies for te
 install-deps-libc-MSYS_NT-10.0: ## Install deps on Windows
 	wget -c https://github.com/libcheck/check/releases/download/0.12.0/check-0.12.0.tar.gz
 	tar -xvf check-0.12.0.tar.gz
-	cd check-0.12.0 && mkdir build
-	cd check-0.12.0/build && cmake ../
-	cd check-0.12.0 && make
-	# cd check-0.12.0 && ./configure --prefix=/usr --disable-static
-	# cd check-0.12.0 && make 
-	# cd check-0.12.0 && make check
-	# cd check-0.12.0 && make install
+	cd check-0.12.0 && ./configure --install=/usr/bin --disable-static
+	cd check-0.12.0 && make 
+	cd check-0.12.0 && make check
+	cd check-0.12.0 && make install
 
 install-deps: install-deps-libc install-deps-skyapi ## Install deps for libc and skyapi