aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2015-05-29 22:29:16 +0200
committerDDuarte <dnpd.dd@gmail.com>2015-06-01 00:35:02 +0100
commit79dd72ae704bce27f59f33dc99f93e2c36755b0e (patch)
treeccc09bf4daaddba9a2a515630f6f1c541c944879
parentbe2fb616c73e475e4926fe7d31fbc2998de48c47 (diff)
Buildsystem: Removed handling for -DPREFIX shortcut for -DCMAKE_INSTALL_PREFIX cmake option, it an internal cmake variable since version 3.2
(cherry picked from commit 1987d3187d1f14cf6dfcaf4f63861db806ad06cc)
-rw-r--r--cmake/macros/CheckPlatform.cmake2
-rw-r--r--cmake/platform/settings.cmake5
2 files changed, 0 insertions, 7 deletions
diff --git a/cmake/macros/CheckPlatform.cmake b/cmake/macros/CheckPlatform.cmake
index e08aaed8db2..0f41a9c127e 100644
--- a/cmake/macros/CheckPlatform.cmake
+++ b/cmake/macros/CheckPlatform.cmake
@@ -7,8 +7,6 @@ else()
MESSAGE(STATUS "Detected 32-bit platform")
endif()
-include("${CMAKE_SOURCE_DIR}/cmake/platform/settings.cmake")
-
if(WIN32)
include("${CMAKE_SOURCE_DIR}/cmake/platform/win/settings.cmake")
elseif(UNIX)
diff --git a/cmake/platform/settings.cmake b/cmake/platform/settings.cmake
deleted file mode 100644
index 6df5bc2165f..00000000000
--- a/cmake/platform/settings.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-# set installation prefix
-if( PREFIX )
- set(CMAKE_INSTALL_PREFIX "${PREFIX}")
-endif()
-