From 82a92639cadb80c529dfbccb78cccf8ea7aec871 Mon Sep 17 00:00:00 2001 From: Kfir Itzhak Date: Fri, 15 Nov 2013 10:44:31 +0200 Subject: [PATCH] Remove importing of binary directory in cmakecacheimport.sh --- CMakeLists.txt | 2 -- cmakecacheimport.sh | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1fa4b2e52..4d663ce32 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -66,8 +66,6 @@ set(ZM_NO_X10 "OFF" CACHE BOOL "Set to ON to build ZoneMinder without X10 suppor set(ZM_PERL_SUBPREFIX "${CMAKE_INSTALL_LIBDIR}/perl5" CACHE PATH "Use a different directory for the zm perl modules. NOTE: This is a subprefix, e.g. lib will be turned into /lib, default: ${CMAKE_INSTALL_LIBDIR}/perl5") set(ZM_PERL_USE_PATH "${CMAKE_INSTALL_PREFIX}/${ZM_PERL_SUBPREFIX}" CACHE PATH "Override the include path for zm perl modules. Useful if you are moving the perl modules without using the ZM_PERL_SUBPREFIX option. default: /") set(ZM_TARGET_DISTRO "" CACHE STRING "Build ZoneMinder for a specific distribution. Currently, valid names are: f19, el6") -# Only required for cmakecacheimport: -set(CMAKE_INSTALL_FULL_BINDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}" CACHE PATH "Override default binary directory") # Required for certain checks to work set(CMAKE_EXTRA_INCLUDE_FILES ${CMAKE_EXTRA_INCLUDE_FILES} stdio.h stdlib.h math.h signal.h) diff --git a/cmakecacheimport.sh b/cmakecacheimport.sh index 4ae5fa49c..79253f6ad 100755 --- a/cmakecacheimport.sh +++ b/cmakecacheimport.sh @@ -44,7 +44,7 @@ if [ "$?" != "0" ]; then fi # Print some information -echo "Executables directory : $ZM_PATH_BIN" +#echo "Executables directory : $ZM_PATH_BIN" #echo "Libraries directory : $ZM_PATH_LIB" #echo "System config directory : $ZM_PATH_CONF" echo "Web directory : $ZM_PATH_WEB" @@ -60,8 +60,8 @@ echo "Database password : Not shown" CMPATH="CACHE PATH \"Imported by cmakecacheimport.sh\" FORCE" CMSTRING="CACHE STRING \"Imported by cmakecacheimport.sh\" FORCE" # Write -echo "# Generated by cmakecacheimport.sh">zm_conf.cmake -echo "set(CMAKE_INSTALL_FULL_BINDIR \"$ZM_PATH_BIN\" $CMPATH)">>zm_conf.cmake +echo "# This file was generated by cmakecacheimport.sh">zm_conf.cmake +#echo "set(CMAKE_INSTALL_FULL_BINDIR \"$ZM_PATH_BIN\" $CMPATH)">>zm_conf.cmake #echo "set(CMAKE_INSTALL_FULL_LIBDIR \"$ZM_PATH_LIB\" $CMPATH)">>zm_conf.cmake #echo "set(CMAKE_INSTALL_FULL_SYSCONFDIR \"$ZM_PATH_CONF\" $CMPATH)">>zm_conf.cmake echo "set(ZM_WEBDIR \"$ZM_PATH_WEB\" $CMPATH)">>zm_conf.cmake