summaryrefslogtreecommitdiff
path: root/cad/boolean/patches/patch-af
blob: 709dc8fdf5efe937e9d910e91368ecbbcc0b7ac3 (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
$NetBSD: patch-af,v 1.4 2006/09/23 14:08:10 joerg Exp $

Variables are referenced using $, not by plain text. Additionally, they
should be defined before being used.

--- apps/edit/CMakeLists.txt.orig	2005-07-18 21:37:32.000000000 +0200
+++ apps/edit/CMakeLists.txt	2006-06-26 11:13:47.000000000 +0200
@@ -26,16 +26,6 @@ FOREACH(file ${header_files})
     SET( headerwithpath  ${headerwithpath} ${edit_SOURCE_DIR}/include/${file}  )
 ENDFOREACH(file)   
 
-IF(WIN32)
-    IF(NOT BORLAND)
-		ADD_DEFINITIONS( -D_MSWVC_  )
-    ENDIF(NOT BORLAND)  
-	ADD_EXECUTABLE( edit WIN32 parser_src tools_src intrface_src misc_src list_src gdssourc_src drivers_src prop_src win32/boolean.rc ${headerwithpath} ) 
-ELSE(WIN32)
-    ADD_DEFINITIONS( -D__UNIX__  )
-	ADD_EXECUTABLE( edit  parser_src tools_src intrface_src misc_src list_src gdssourc_src drivers_src prop_src ) 
-ENDIF(WIN32)	
-
 AUX_SOURCE_DIRECTORY( src/parser parser_src )
 AUX_SOURCE_DIRECTORY( src/tools tools_src )
 AUX_SOURCE_DIRECTORY( src/intrface intrface_src )
@@ -44,9 +34,19 @@ AUX_SOURCE_DIRECTORY( src/list list_src 
 AUX_SOURCE_DIRECTORY( src/gdssourc gdssourc_src )
 AUX_SOURCE_DIRECTORY( src/drivers drivers_src )
 AUX_SOURCE_DIRECTORY( src/props prop_src )
+
+IF(WIN32)
+    IF(NOT BORLAND)
+		ADD_DEFINITIONS( -D_MSWVC_  )
+    ENDIF(NOT BORLAND)  
+	ADD_EXECUTABLE( edit WIN32 parser_src tools_src intrface_src misc_src list_src gdssourc_src drivers_src prop_src win32/boolean.rc ${headerwithpath} ) 
+ELSE(WIN32)
+    ADD_DEFINITIONS( -D__UNIX__  )
+	ADD_EXECUTABLE( edit  ${parser_src} ${tools_src} ${intrface_src} ${misc_src} ${list_src} ${gdssourc_src} ${drivers_src} ${prop_src}) 
+ENDIF(WIN32)	
 
-LINK_LIBRARIES( kbool )
 
 TARGET_LINK_LIBRARIES( edit  ${WXART2D_LIBS})
+TARGET_LINK_LIBRARIES( edit  kbool)