From 217f52fb121ef92491e5d5f71394b07ce4ead1d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D1=82=D1=80=20=D0=A8=D1=83=D1=80=D0=B3=D0=B0?= =?UTF-8?q?=D0=BB=D0=B8=D0=BD?= Date: Tue, 9 Jan 2018 07:22:08 +0300 Subject: [PATCH] CMake: CMAKE_INSTALL_PREFIX for Linux (#243) * CMake: CMAKE_INSTALL_PREFIX for Linux If on Linux system CMAKE_INSTALL_PREFIX is set it overrides CPACK_PACKAGING_INSTALL_PREFIX key. * Readme: readme for MinGW building and installation * Update README.markdown --- CPackLists.txt | 12 +++++------- README.markdown | 23 +++++++++++++++++++++++ 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/CPackLists.txt b/CPackLists.txt index d0c46b17..7a89ad0c 100644 --- a/CPackLists.txt +++ b/CPackLists.txt @@ -15,12 +15,10 @@ # DESTINATION include # COMPONENT headers) -IF(MINGW) - SET(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/g3log") -ENDIF() - IF(NOT MINGW) - IF(NOT CPACK_PACKAGING_INSTALL_PREFIX) + IF(NOT CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + SET(CPACK_PACKAGING_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") + ELSEIF(NOT CPACK_PACKAGING_INSTALL_PREFIX) SET(CPACK_PACKAGING_INSTALL_PREFIX /usr/local) ENDIF() ENDIF() @@ -82,8 +80,8 @@ message( STATUS "make package" ) message( STATUS "\nOption to install using 'make install'" ) message( STATUS "Installation locations: " ) message( STATUS "====================" ) -message( STATUS "Headers: ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_HEADERDIR}" ) -message( STATUS "Library installation directory: ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}" ) +message( STATUS "Headers: ${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_HEADERDIR}" ) +message( STATUS "Library installation directory: ${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}" ) message( STATUS "For more information please see g3log/CPackLists.txt\n\n" ) IF(NOT MINGW) diff --git a/README.markdown b/README.markdown index 07cc6b49..aa768b1c 100644 --- a/README.markdown +++ b/README.markdown @@ -211,6 +211,14 @@ cd ../../ mkdir build cd build ``` +## Configuring for installing on nix (OSX, Linux, MinGW) +Default install prefix on Linux is `/usr/local` +To change it please set `CPACK_PACKAGING_INSTALL_PREFIX ` + +``` +cmake -DCPACK_PACKAGING_INSTALL_PREFIX= ... +``` + ## Building on Linux ``` @@ -227,6 +235,21 @@ make package sudo dpkg -i g3log--Linux.deb ``` +## Building on MinGW +``` +cmake -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=Release .. +make +``` +## Installing on MinGW +``` +make install +``` +Alternative using NSIS +``` +make package +g3log--win32.exe +``` + ## Building on Windows Please use the Visual Studio 12 (2013) command prompt "Developer command prompt" ```