Browse code

* adapted project to mulle-configuration 3

Nat! authored on 16-09-2017 12:32:48
Showing 2 changed files
... ...
@@ -21,7 +21,6 @@ set( GOOGLE_TOOLBOX_SOURCES
21 21
 "google-toolbox-for-mac/Foundation/GTMNSString+HTML.m"
22 22
 )
23 23
 
24
-
25 24
 set( HEADERS
26 25
 ${MULLE_SCION_HEADERS}
27 26
 ${MULLE_SCION_FOUNDATION_HEADERS}
... ...
@@ -39,7 +38,7 @@ FIND_PACKAGE( ZLIB REQUIRED)
39 38
 message( STATUS "FOUNDATION_LIBRARY is ${FOUNDATION_LIBRARY}")
40 39
 message( STATUS "ZLIB_LIBRARIES is ${ZLIB_LIBRARIES}")
41 40
 
42
-add_definitions( -DPROJECT_VERSION=1858.2)
41
+add_definitions( -DPROJECT_VERSION=1858.3)
43 42
 
44 43
 
45 44
 add_library( MulleScion STATIC
... ...
@@ -49,12 +48,15 @@ ${MULLE_SCION_PARSER_SOURCES}
49 48
 ${MULLE_SCION_PRINTER_SOURCES}
50 49
 ${GOOGLE_TOOLBOX_SOURCES}
51 50
 ${HOEDOWN_SOURCES}
51
+${HEADERS}
52
+CMakeSourcesAndHeaders.txt
52 53
 )
53 54
 
54 55
 
55 56
 add_executable( mulle-scion
56 57
 ${MONGOOSE_SOURCES}
57 58
 ${TOOL_SOURCES}
59
+CMakeSourcesAndHeaders.txt
58 60
 )
59 61
 
60 62
 
... ...
@@ -65,25 +67,17 @@ $<TARGET_FILE:MulleScion>
65 67
 ${OBJC_DEPENDENCY_LIBRARIES}
66 68
 )
67 69
 
68
-if( FORCE_LOAD)
69
-   set( TMP)
70
-   foreach( library ${TARGET_ALL_LOAD_LIBRARIES})
71
-      list( APPEND TMP "${FORCE_LOAD} ${library}")
72
-   endforeach( library)
73
-   set( TARGET_ALL_LOAD_LIBRARIES ${TMP})
74
-endif()
75
-
76 70
 
77
-target_link_libraries( mulle-scion
78
-${BEGIN_ALL_LOAD}
79
-${TARGET_ALL_LOAD_LIBRARIES}
80
-${END_ALL_LOAD}
71
+set( EXECUTABLE_NAME "mulle-scion")
72
+set( EXECUTABLE_ALL_LOAD_LIBRARIES ${TARGET_ALL_LOAD_LIBRARIES})
73
+set( EXECUTABLE_NORMAL_LOAD_LIBRARIES
81 74
 ${ZLIB_LIBRARIES}
82 75
 ${C_DEPENDENCY_LIBRARIES}
83 76
 ${FOUNDATION_LIBRARY}
84
-${OS_SPECIFIC_LIBS}
85 77
 )
86 78
 
79
+include( ExecutableObjC)
80
+
87 81
 
88 82
 # INSTALL( TARGETS MulleScion DESTINATION "lib")
89 83
 # INSTALL( FILES ${HEADERS} DESTINATION "include/MulleScion")
... ...
@@ -527,7 +527,6 @@
527 527
 		413C51661CC284CA00F62468 /* IOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = IOS.xcconfig; sourceTree = "<group>"; };
528 528
 		413C51671CC284CA00F62468 /* Library.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Library.xcconfig; sourceTree = "<group>"; };
529 529
 		413C51681CC284CA00F62468 /* OSX.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = OSX.xcconfig; sourceTree = "<group>"; };
530
-		413C51691CC284CA00F62468 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
531 530
 		413C516B1CC284CA00F62468 /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
532 531
 		413C516C1CC284CA00F62468 /* StaticLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = StaticLibrary.xcconfig; sourceTree = "<group>"; };
533 532
 		413C516D1CC284CA00F62468 /* StaticLibraryIOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = StaticLibraryIOS.xcconfig; sourceTree = "<group>"; };
... ...
@@ -535,7 +534,6 @@
535 534
 		413C516F1CC284CA00F62468 /* ToolOSX.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = ToolOSX.xcconfig; sourceTree = "<group>"; };
536 535
 		413C51701CC284CA00F62468 /* _Common.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = _Common.xcconfig; sourceTree = "<group>"; };
537 536
 		413C51711CC284CA00F62468 /* generate-dot.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "generate-dot.sh"; sourceTree = "<group>"; };
538
-		413C51721CC284CA00F62468 /* update-all-configurations.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "update-all-configurations.sh"; sourceTree = "<group>"; };
539 537
 		414A435119040A120020C6FF /* log.scion */ = {isa = PBXFileReference; lastKnownFileType = text; path = log.scion; sourceTree = "<group>"; };
540 538
 		414A842516E528890084AE1E /* MulleScionDataFlow.graffle */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = MulleScionDataFlow.graffle; sourceTree = "<group>"; };
541 539
 		414A842616E5288A0084AE1E /* MulleScionDataFlow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = MulleScionDataFlow.png; sourceTree = "<group>"; };
... ...
@@ -783,7 +781,6 @@
783 781
 				413C51661CC284CA00F62468 /* IOS.xcconfig */,
784 782
 				413C51671CC284CA00F62468 /* Library.xcconfig */,
785 783
 				413C51681CC284CA00F62468 /* OSX.xcconfig */,
786
-				413C51691CC284CA00F62468 /* README.md */,
787 784
 				413C516B1CC284CA00F62468 /* Release.xcconfig */,
788 785
 				413C516C1CC284CA00F62468 /* StaticLibrary.xcconfig */,
789 786
 				413C516D1CC284CA00F62468 /* StaticLibraryIOS.xcconfig */,
... ...
@@ -791,9 +788,9 @@
791 788
 				413C516F1CC284CA00F62468 /* ToolOSX.xcconfig */,
792 789
 				413C51701CC284CA00F62468 /* _Common.xcconfig */,
793 790
 				413C51711CC284CA00F62468 /* generate-dot.sh */,
794
-				413C51721CC284CA00F62468 /* update-all-configurations.sh */,
795 791
 			);
796
-			path = "mulle-configuration";
792
+			name = "mulle-configuration";
793
+			path = "mulle-configuration/xcode";
797 794
 			sourceTree = "<group>";
798 795
 		};
799 796
 		415918021A974436006ECD52 /* mongoose */ = {