From 71359f5b9dcbf2404fab4e201961d2ddc7f52ee7 Mon Sep 17 00:00:00 2001
From: Alexander Neundorf <neundorf@kde.org>
Date: Mon, 21 May 2007 11:26:40 -0400
Subject: STYLE: use a separate source file for generating CMakeSystem.cmake if
 CMAKE_TOOLCHAIN_FILE is used

Alex
---
 Modules/CMakeSystem.cmake.in | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

(limited to 'Modules/CMakeSystem.cmake.in')

diff --git a/Modules/CMakeSystem.cmake.in b/Modules/CMakeSystem.cmake.in
index 0fbf387e4e..785f197e20 100644
--- a/Modules/CMakeSystem.cmake.in
+++ b/Modules/CMakeSystem.cmake.in
@@ -1,21 +1,6 @@
-IF("@CMAKE_TOOLCHAIN_FILE@" STREQUAL "")
-
-  SET(CMAKE_SYSTEM "@CMAKE_SYSTEM@")
-  SET(CMAKE_SYSTEM_NAME "@CMAKE_SYSTEM_NAME@")
-  SET(CMAKE_SYSTEM_VERSION "@CMAKE_SYSTEM_VERSION@")
-  SET(CMAKE_SYSTEM_PROCESSOR "@CMAKE_SYSTEM_PROCESSOR@")
-  
-ELSE("@CMAKE_TOOLCHAIN_FILE@" STREQUAL "")
-
-  INCLUDE("@CMAKE_TOOLCHAIN_FILE@")
-
-# set CMAKE_SYSTEM to the CMAKE_SYSTEM_NAME
-  SET(CMAKE_SYSTEM  ${CMAKE_SYSTEM_NAME})
-# if there is a CMAKE_SYSTEM_VERSION then add a -${CMAKE_SYSTEM_VERSION}
-  IF(CMAKE_SYSTEM_VERSION)
-    SET(CMAKE_SYSTEM ${CMAKE_SYSTEM}-${CMAKE_SYSTEM_VERSION})
-  ENDIF(CMAKE_SYSTEM_VERSION)
-
-ENDIF("@CMAKE_TOOLCHAIN_FILE@" STREQUAL "")
+SET(CMAKE_SYSTEM "@CMAKE_SYSTEM@")
+SET(CMAKE_SYSTEM_NAME "@CMAKE_SYSTEM_NAME@")
+SET(CMAKE_SYSTEM_VERSION "@CMAKE_SYSTEM_VERSION@")
+SET(CMAKE_SYSTEM_PROCESSOR "@CMAKE_SYSTEM_PROCESSOR@")
 
 SET(CMAKE_SYSTEM_LOADED 1)
-- 
cgit v1.2.1