summaryrefslogtreecommitdiff
blob: 57ecf95d2db2b58fd0ff17a9b28b9500baf9bcab (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
--- CMakeLists.txt~	2012-11-14 09:51:00.000000000 +0100
+++ CMakeLists.txt	2012-11-14 09:53:20.662111051 +0100
@@ -11,7 +11,7 @@
 set(FREEORION_VERSION 0.4.1)
 set(FREEORION_RELEASE false)
 
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_HOME_DIRECTORY}/cmake ${CMAKE_HOME_DIRECTORY}/GG/cmake)
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_HOME_DIRECTORY}/cmake)
 include(Config)
 include(Util)
 
@@ -474,13 +474,6 @@
 
     install(
         FILES
-        ../build/GG/CMakeCache.txt
-        DESTINATION build/GG
-        COMPONENT COMPONENT_FREEORION_BUILD_FILES_GIGI
-    )
-
-    install(
-        FILES
         ../build/CMakeCache.txt
         DESTINATION build
         COMPONENT COMPONENT_FREEORION_BUILD_FILES_FREEORION
@@ -590,21 +583,6 @@
         StrCpy $7 $INSTDIR
         \\\${WordReplace} $7 \\\"\\\\\\\" \\\"/\\\" \\\"+\\\" $8
 
-	Rename $INSTDIR\\\\build\\\\GG\\\\CMakeCache.txt $INSTDIR\\\\build\\\\GG\\\\CMakeCache.txt.in
-        FileOpen $0 $INSTDIR\\\\build\\\\GG\\\\CMakeCache.txt.in r
-        FileOpen $5 $INSTDIR\\\\build\\\\GG\\\\CMakeCache.txt w
-        ClearErrors
-        loop1:
-            FileRead $0 $1
-            IfErrors done1
-            \\\${WordReplace} $1 \\\"${sdk_root}\\\" $8 \\\"+\\\" $2
-            FileWrite $5 $2
-            Goto loop1
-        done1:
-        FileClose $0
-        FileClose $5
-        Delete $INSTDIR\\\\build\\\\GG\\\\CMakeCache.txt.in
-
 	Rename $INSTDIR\\\\build\\\\CMakeCache.txt $INSTDIR\\\\build\\\\CMakeCache.txt.in
         FileOpen $0 $INSTDIR\\\\build\\\\CMakeCache.txt.in r
         FileOpen $5 $INSTDIR\\\\build\\\\CMakeCache.txt w