summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorŁukasz Stelmach <l.stelmach@samsung.com>2017-05-18 09:16:19 +0200
committerŁukasz Stelmach <l.stelmach@samsung.com>2017-05-25 11:03:40 +0200
commitb064f6d5f3caf4eeec75b7160228de986d0059a7 (patch)
tree74e6154754ac15fde8d29b82c926244c28972ca4
parent86c80acca75a1b2a5ae7f1061b5f63f76d5a6d63 (diff)
downloadejdb-b064f6d5f3caf4eeec75b7160228de986d0059a7.tar.gz
ejdb-b064f6d5f3caf4eeec75b7160228de986d0059a7.tar.bz2
ejdb-b064f6d5f3caf4eeec75b7160228de986d0059a7.zip
Change the workaround according to developer's advice
CMake developer adviced[1] to use the workaround from 65ee196a as a permanent solution, without dependance on CMake's version. [1] https://gitlab.kitware.com/cmake/cmake/merge_requests/827#note_267940 Forwarded: https://github.com/Softmotions/ejdb/pull/188 Change-Id: Iabd5cf6dc8f4a5b1473d09f35ff18f595267a18c Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
-rw-r--r--CMakeLists.txt6
1 files changed, 2 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index efe88de..e2d6a60 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -71,10 +71,8 @@ else()
set(PACKAGE_DEB ON)
endif()
-if (CMAKE_VERSION VERSION_LESS 3.8.2)
- if(NOT DEFINED CPACK_PACKAGING_INSTALL_PREFIX)
- set(CPACK_PACKAGING_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
- endif()
+if(NOT CPACK_PACKAGING_INSTALL_PREFIX)
+ set(CPACK_PACKAGING_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
endif()
set(CPACK_GENERATORS)