Browse code

Adapt to changes in mulle-configuration

Nat! authored on 11/08/2017 15:54:33
Showing 4 changed files
... ...
@@ -39,7 +39,7 @@ FIND_PACKAGE( ZLIB REQUIRED)
39 39
 message( STATUS "FOUNDATION_LIBRARY is ${FOUNDATION_LIBRARY}")
40 40
 message( STATUS "ZLIB_LIBRARIES is ${ZLIB_LIBRARIES}")
41 41
 
42
-add_definitions( -DPROJECT_VERSION=1858.1)
42
+add_definitions( -DPROJECT_VERSION=1858.2)
43 43
 
44 44
 
45 45
 add_library( MulleScion STATIC
... ...
@@ -58,13 +58,29 @@ ${TOOL_SOURCES}
58 58
 )
59 59
 
60 60
 
61
+add_dependencies( mulle-scion MulleScion)
62
+
63
+set( TARGET_ALL_LOAD_LIBRARIES
64
+$<TARGET_FILE:MulleScion>
65
+${OBJC_DEPENDENCY_LIBRARIES}
66
+)
67
+
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
+
61 77
 target_link_libraries( mulle-scion
62 78
 ${BEGIN_ALL_LOAD}
63
-MulleScion
64
-${DEPENDENCY_LIBRARIES}
65
-${FOUNDATION_LIBRARY}
66
-${ZLIB_LIBRARIES}
79
+${TARGET_ALL_LOAD_LIBRARIES}
67 80
 ${END_ALL_LOAD}
81
+${ZLIB_LIBRARIES}
82
+${C_DEPENDENCY_LIBRARIES}
83
+${FOUNDATION_LIBRARY}
68 84
 ${OS_SPECIFIC_LIBS}
69 85
 )
70 86
 
... ...
@@ -1,6 +1,6 @@
1 1
 Pod::Spec.new do |s|
2 2
   s.name             = "MulleScion"
3
-  s.version          = '1858.1'
3
+  s.version          = '1858.2'
4 4
   s.summary          = "MulleScion a modern Template library for ObjC."
5 5
   s.description      = <<-DESC
6 6
                        MulleScion is indeed a modern Template library for ObjC.
... ...
@@ -1963,7 +1963,7 @@
1963 1963
 			baseConfigurationReference = 413C51611CC284CA00F62468 /* Debug.xcconfig */;
1964 1964
 			buildSettings = {
1965 1965
 				CLANG_WARN_INT_CONVERSION = YES;
1966
-				CURRENT_PROJECT_VERSION = 1858.1;
1966
+				CURRENT_PROJECT_VERSION = 1858.2;
1967 1967
 				DYLIB_COMPATIBILITY_VERSION = 1848.0;
1968 1968
 				DYLIB_CURRENT_VERSION = "$(CURRENT_PROJECT_VERSION)";
1969 1969
 				GCC_OPTIMIZATION_LEVEL = 0;
... ...
@@ -1995,7 +1995,7 @@
1995 1995
 			baseConfigurationReference = 413C516B1CC284CA00F62468 /* Release.xcconfig */;
1996 1996
 			buildSettings = {
1997 1997
 				CLANG_WARN_INT_CONVERSION = YES;
1998
-				CURRENT_PROJECT_VERSION = 1858.1;
1998
+				CURRENT_PROJECT_VERSION = 1858.2;
1999 1999
 				DYLIB_COMPATIBILITY_VERSION = 1848.0;
2000 2000
 				DYLIB_CURRENT_VERSION = "$(CURRENT_PROJECT_VERSION)";
2001 2001
 				GCC_PREPROCESSOR_DEFINITIONS = (
... ...
@@ -2064,7 +2064,7 @@
2064 2064
 			baseConfigurationReference = 413C516B1CC284CA00F62468 /* Release.xcconfig */;
2065 2065
 			buildSettings = {
2066 2066
 				CLANG_WARN_INT_CONVERSION = YES;
2067
-				CURRENT_PROJECT_VERSION = 1858.1;
2067
+				CURRENT_PROJECT_VERSION = 1858.2;
2068 2068
 				DYLIB_COMPATIBILITY_VERSION = 1848.0;
2069 2069
 				DYLIB_CURRENT_VERSION = "$(CURRENT_PROJECT_VERSION)";
2070 2070
 				GCC_PREPROCESSOR_DEFINITIONS = (
... ...
@@ -1,3 +1,7 @@
1
+### 1858.2
2
+
3
+* adapt to changes in mulle-configuration
4
+
1 5
 ### 1858.1
2 6
 
3 7
 * fix build problem with new mulle-configuration