#7 add ZZIP_INSTALL_BINS cmake-option

diff --git a/GNUmakefile b/GNUmakefile
index 53077b0b14c3f4a93c42a056d6b0068ad9486b05..4aa05f295140e21bba1df81a26838438d2302220 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -18,8 +18,10 @@ am autom: ; rm -rf build-am; $(MAKE) build-am && cd build-am && $(MAKE) all
 cm cmake: ; rm -rf build-cm; $(MAKE) build-cm && cd build-cm && $(MAKE) all
 nj ninja: ; rm -rf build-nj; $(MAKE) build-nj && cd build-nj && ninja
 
-build-cm2: ; mkdir build-cm2; cd build-cm2 && cmake .. -DCMAKE_INSTALL_PREFIX:PATH=$$HOME/local -DZZIP_MANPAGES=OFF
+build-cm2: ; mkdir build-cm2; cd build-cm2 && cmake .. -DCMAKE_INSTALL_PREFIX:PATH=$$HOME/local -DZZIP_MANPAGES=OFF -DZZIP_INSTALL_BINS=OFF
 cm2: ; rm -rf build-cm2; $(MAKE) build-cm2 && cd build-cm2 && $(MAKE) all
+cm2-install: ; cd build-cm2 && $(MAKE) install
+un uninstall: ; rm -rf $$HOME/local
 
 new: ; rm -rf build; $(MAKE) default
 

diff --git a/bins/CMakeLists.txt b/bins/CMakeLists.txt
index d9466e30db9d305d8013ea275b021fa84b6e5d64..4e1b61941e8b875071f0cbe27948916100de7c5f 100644 (file)
--- a/bins/CMakeLists.txt
+++ b/bins/CMakeLists.txt
@@ -14,6 +14,9 @@ option(BUILD_STATIC_LIBS "Build the static library" OFF)
 option(BUILD_TESTS "Build test programs" OFF)
 option(MSVC_STATIC_RUNTIME "Build with static runtime libs (/MT)" ON)
 
+option(ZZIP_INSTALL_BINS "Install the bins/ exanple programs" ON)
+option(ZZIP_INSTALL_ACLOCAL "Install zziplib.m4 aclocal helper" ON)
+
 # Zlib library needed
 find_package ( ZLIB REQUIRED )
 # pkg_search_module ( ZZIP zzip )
@@ -64,8 +67,13 @@ target_include_directories(unzzip-mem   PRIVATE "${CMAKE_SOURCE_DIR}" "${CMAKE_B
 target_include_directories(unzip-mem    PRIVATE "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
 
 # install ########################################################
+if(ZZIP_INSTALL_BINS)
 install(TARGETS zzcat zzdir zzxorcat zzxordir zzxorcopy
                 unzzip unzzip-mix unzzip-big unzzip-mem unzip-mem
         DESTINATION "${CMAKE_INSTALL_BINDIR}")
+endif()
+
+if(ZZIP_INSTALL_ACLOCAL)
 install(FILES zziplib.m4
         DESTINATION "${CMAKE_INSTALL_DATADIR}/aclocal")
+endif()