31 lines
830 B
Diff
31 lines
830 B
Diff
|
From ccc3596aa3ca041f457bf44d3437d935f56e82a4 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Orivej Desh <orivej@gmx.fr>
|
||
|
|
Date: Sun, 26 Mar 2017 23:57:32 +0000
|
||
|
|
Subject: [PATCH] Do not override CMAKE_INSTALL_PREFIX
|
||
|
|
|
||
|
|
---
|
||
|
|
CMakeLists.txt | 7 +------
|
||
|
|
1 file changed, 1 insertion(+), 6 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||
|
|
index 517b25e..6d8ced2 100644
|
||
|
|
--- a/CMakeLists.txt
|
||
|
|
+++ b/CMakeLists.txt
|
||
|
|
@@ -141,12 +141,7 @@ if (ENABLE_TESTS)
|
||
|
|
endif (ENABLE_TESTS)
|
||
|
|
|
||
|
|
# Installation prefix
|
||
|
|
-if (NOT CMAKE_SYSTEM MATCHES "FreeBSD")
|
||
|
|
- set (CMAKE_INSTALL_PREFIX /usr)
|
||
|
|
- set (CLICKHOUSE_ETC_DIR /etc)
|
||
|
|
-else ()
|
||
|
|
- set (CLICKHOUSE_ETC_DIR ${CMAKE_INSTALL_PREFIX}/etc)
|
||
|
|
-endif ()
|
||
|
|
+set (CLICKHOUSE_ETC_DIR ${CMAKE_INSTALL_PREFIX}/etc)
|
||
|
|
|
||
|
|
|
||
|
|
option (UNBUNDLED "Try find all libraries in system (if fail - use bundled from contrib/)" OFF)
|
||
|
|
--
|
||
|
|
2.12.0
|
||
|
|
|