From: inikep <inikep@gmail.com>
Date: Fri, 3 Jun 2016 09:40:15 +0000 (+0200)
Subject: Travis cmaketest will also run "make install" and "make uninstall"
X-Git-Tag: v0.7.0^2~49^2~21^2^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7f008b069d25facb7b228c6a36c6dde497dd33d;p=thirdparty%2Fzstd.git

Travis cmaketest will also run "make install" and "make uninstall"
---

diff --git a/Makefile b/Makefile
index c8b5831ba..755b0c1a8 100644
--- a/Makefile
+++ b/Makefile
@@ -155,7 +155,7 @@ cmaketest:
 	cmake --version
 	rm -rf projects/cmake/build
 	mkdir projects/cmake/build
-	cd projects/cmake/build ; cmake $(CMAKE_PARAMS) .. ; $(MAKE)
+	cd projects/cmake/build ; cmake -DPREFIX:STRING=~/install_test_dir $(CMAKE_PARAMS) .. ; $(MAKE) install ; $(MAKE) uninstall
 
 c90test: clean
 	CFLAGS="-std=c90" $(MAKE) all  # will fail, due to // and long long
diff --git a/projects/cmake/lib/CMakeLists.txt b/projects/cmake/lib/CMakeLists.txt
index 3b7bc802c..84568b207 100644
--- a/projects/cmake/lib/CMakeLists.txt
+++ b/projects/cmake/lib/CMakeLists.txt
@@ -157,13 +157,15 @@ SET_TARGET_PROPERTIES(
         OUTPUT_NAME ${SHARED_LIBRARY_OUTPUT_NAME})
 
 IF (UNIX)
-    SET(PREFIX /usr/local)
+    IF ("${PREFIX}" STREQUAL "")
+        SET(PREFIX /usr/local)
+    ENDIF()
+    MESSAGE("the variable PREFIX=${PREFIX}")
     SET(INSTALL_LIBRARY_DIR ${PREFIX}/lib)
     SET(INSTALL_INCLUDE_DIR ${PREFIX}/include)
 
     # install target
-    INSTALL(FILES ${LIBRARY_DIR}/common/zstd.h ${LIBRARY_DIR}/common/zstd_static.h ${LIBRARY_DIR}/common/zbuff.h ${LIBRARY_DIR}/common/zbuff_static.h
-            ${LIBRARY_DIR}/common/mem.h ${LIBRARY_DIR}/common/error_public.h ${LIBRARY_DIR}/dictBuilder/zdict.h ${LIBRARY_DIR}/dictBuilder/zdict_static.h DESTINATION ${INSTALL_INCLUDE_DIR})
+    INSTALL(FILES ${LIBRARY_DIR}/common/zstd.h ${LIBRARY_DIR}/common/zbuff.h ${LIBRARY_DIR}/dictBuilder/zdict.h DESTINATION ${INSTALL_INCLUDE_DIR})
     INSTALL(TARGETS libzstd_static DESTINATION ${INSTALL_LIBRARY_DIR})
     INSTALL(TARGETS libzstd_shared LIBRARY DESTINATION ${INSTALL_LIBRARY_DIR})