From ddfa70f56b91b013cd53be6752ea72451b32c852 Mon Sep 17 00:00:00 2001 From: davidhubbard Date: Thu, 21 Jul 2016 15:11:59 -0700 Subject: [PATCH] build: pr787 - CMAKE_INSTALL_PREFIX default CMAKE_INSTALL_PREFIX default is /usr/local on unix In order to build with a custom CMAKE_INSTALL_PREFIX, the line set (CMAKE_INSTALL_PREFIX "") must be removed. CMake set will overwrite anything specified on the command line with cmake -DCMAKE_INSTALL_PREFIX. Change-Id: I3bc905b4ad8fb08917e500e4987eb0277ba74a40 --- CMakeLists.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 263002e..8df90e1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,8 +57,6 @@ if(NOT WIN32) include(FindPkgConfig) endif() -set (CMAKE_INSTALL_PREFIX "") - if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang") set(COMMON_COMPILE_FLAGS "-Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers") set(COMMON_COMPILE_FLAGS "${COMMON_COMPILE_FLAGS} -fno-strict-aliasing -fno-builtin-memcmp") @@ -262,7 +260,7 @@ if(NOT WIN32) include(GNUInstallDirs) add_definitions(-DSYSCONFDIR="${CMAKE_INSTALL_SYSCONFDIR}") add_definitions(-DDATADIR="${CMAKE_INSTALL_DATADIR}") - if (CMAKE_INSTALL_PREFIX STREQUAL "/usr") + if (CMAKE_INSTALL_PREFIX STREQUAL "/usr/local") elseif (CMAKE_INSTALL_PREFIX STREQUAL "") else() add_definitions(-DLOCALPREFIX="${CMAKE_INSTALL_PREFIX}") -- 2.7.4