Browse code

* improved aba library find_library

Nat! authored on 29-05-2019 18:11:43
Showing 23 changed files
... ...
@@ -41,6 +41,6 @@ export KITCHEN_DIR="${MULLE_VIRTUAL_ROOT}/kitchen"
41 41
 #
42 42
 #
43 43
 #
44
-export MULLE_SDE_INSTALLED_VERSION="0.38.0"
44
+export MULLE_SDE_INSTALLED_VERSION="0.38.4"
45 45
 
46 46
 
... ...
@@ -23,7 +23,7 @@ then
23 23
    MULLE_HOSTNAME="`PATH=/bin:/usr/bin:/sbin:/usr/sbin hostname -s`"
24 24
    if [ "${MULLE_HOSTNAME:0:1}" = '.' ]
25 25
    then
26
-      MULLE_HOSTNAME="_terodde"
26
+      MULLE_HOSTNAME="_walitza"
27 27
    fi
28 28
    export MULLE_HOSTNAME
29 29
 fi
... ...
@@ -1 +1 @@
1
-2.3.0
1
+2.3.1
... ...
@@ -1 +1 @@
1
-0.10.0
1
+0.10.1
... ...
@@ -1 +1 @@
1
-0.10.0
1
+0.10.1
... ...
@@ -1 +1 @@
1
-0.10.0
1
+0.10.1
... ...
@@ -1 +1 @@
1
-0.10.0
1
+0.10.1
... ...
@@ -1 +1 @@
1
-0.10.0
1
+0.10.1
... ...
@@ -1 +1 @@
1
-0.16.0
1
+0.16.1
... ...
@@ -1 +1 @@
1
-0.16.0
1
+0.16.1
... ...
@@ -1 +1 @@
1
-0.16.0
1
+0.16.1
... ...
@@ -1 +1 @@
1
-0.16.0
1
+0.16.1
... ...
@@ -1 +1 @@
1
-0.16.0
1
+0.16.1
... ...
@@ -1,3 +1,7 @@
1
+### 2.2.4
2
+
3
+* improved aba library `find_library`
4
+
1 5
 ### 2.2.3
2 6
 
3 7
 * fix error value EINVAL on enumerate and improve comments detailing error codes
... ...
@@ -7,7 +7,7 @@ endif()
7 7
 
8 8
 # sourcetree: MULLE_ABA;no-all-load,no-singlephase;
9 9
 if( NOT MULLE_ABA_LIBRARY)
10
-   find_library( MULLE_ABA_LIBRARY NAMES ${CMAKE_STATIC_LIBRARY_PREFIX}mulle-aba${CMAKE_STATIC_LIBRARY_SUFFIX} mulle-aba)
10
+   find_library( MULLE_ABA_LIBRARY NAMES ${CMAKE_STATIC_LIBRARY_PREFIX}mulle-aba${CMAKE_STATIC_LIBRARY_SUFFIX} mulle-aba NO_CMAKE_SYSTEM_PATH)
11 11
    message( STATUS "MULLE_ABA_LIBRARY is ${MULLE_ABA_LIBRARY}")
12 12
    #
13 13
    # the order looks ascending, but due to the way this file is read
... ...
@@ -149,6 +149,7 @@ if( NOT __ENVIRONMENT__CMAKE__)
149 149
    )
150 150
 
151 151
 
152
+   message( STATUS "CMAKE_PREFIX_PATH=\"${CMAKE_PREFIX_PATH}\"" )
152 153
    message( STATUS "CMAKE_INCLUDE_PATH=\"${CMAKE_INCLUDE_PATH}\"" )
153 154
    message( STATUS "CMAKE_LIBRARY_PATH=\"${CMAKE_LIBRARY_PATH}\"" )
154 155
    message( STATUS "CMAKE_FRAMEWORK_PATH=\"${CMAKE_FRAMEWORK_PATH}\"" )
... ...
@@ -217,7 +218,7 @@ if( NOT __ENVIRONMENT__CMAKE__)
217 218
    #
218 219
    if( NOT MULLE_NO_CMAKE_INSTALL_RPATH)
219 220
       if( APPLE)
220
-         set( CMAKE_INSTALL_RPATH "@rpath/../lib")
221
+         set( CMAKE_INSTALL_RPATH "@rpath/../lib/")
221 222
       else()
222 223
          set( CMAKE_INSTALL_RPATH "\$ORIGIN/../lib")
223 224
       endif()
... ...
@@ -55,10 +55,21 @@ if( LINK_PHASE)
55 55
    #
56 56
    include( ExecutableAux OPTIONAL)
57 57
 
58
+   #
59
+   # Now if the local project also produces a startup add_library
60
+   # add this to dependencies (mulle-objc-runtime)
61
+   # This should be harmless, even if there is no real dependency.
62
+   #
63
+   if( STARTUP_SOURCES AND DEFINED STARTUP_LIBRARY_NAME)
64
+      add_dependencies( "${EXECUTABLE_NAME}"
65
+         "${STARTUP_LIBRARY_NAME}"
66
+      )
67
+   endif()
68
+
58 69
    #
59 70
    # fall back if EXECUTABLE_LIBRARY_LIST is not set by ALL_LOAD
60 71
    #
61
-   if( NOT EXECUTABLE_LIBRARY_LIST)
72
+   if( NOT DEFINED EXECUTABLE_LIBRARY_LIST)
62 73
       if( ALL_LOAD_DEPENDENCY_LIBRARIES)
63 74
          message( FATAL_ERROR "ALL_LOAD_DEPENDENCY_LIBRARIES \
64 75
 \"${ALL_LOAD_DEPENDENCY_LIBRARIES}\" are not linked to ${EXECUTABLE_NAME}.
... ...
@@ -1,12 +1,8 @@
1 1
 /*
2 2
    This file will be regenerated by `mulle-sde update|monitor`.
3
-   Edits will be lost.
4
-   Suppress this file with MULLE_SOURCETREE_TO_C_PRIVATEINCLUDE_FILE NONE|DISABLE.
5
-*/
6
-/*
7
-   This file will be regenerated by `mulle-sde update|monitor`.
8
-   Edits will be lost.
9
-   Suppress this file with MULLE_SOURCETREE_TO_C_IMPORT_FILE NONE|DISABLE.
3
+   Edits will be lost. Suppress this file with:
4
+
5
+   mulle-sde environment set MULLE_SOURCETREE_TO_C_PRIVATEINCLUDE_FILE DISABLE
10 6
 */
11 7
 #ifndef _mulle_concurrent_include_private_h__
12 8
 #define _mulle_concurrent_include_private_h__
... ...
@@ -14,4 +10,3 @@
14 10
 /* no headers */
15 11
 
16 12
 #endif
17
-
... ...
@@ -1,18 +1,14 @@
1 1
 /*
2 2
    This file will be regenerated by `mulle-sde update|monitor`.
3
-   Edits will be lost.
4
-   Suppress this file with MULLE_SOURCETREE_TO_C_INCLUDE_FILE NONE|DISABLE.
5
-*/
6
-/*
7
-   This file will be regenerated by `mulle-sde update|monitor`.
8
-   Edits will be lost.
9
-   Suppress this file with MULLE_SOURCETREE_TO_C_INCLUDE_FILE NONE|DISABLE.
3
+   Edits will be lost. Suppress this file with:
4
+
5
+   mulle-sde environment set MULLE_SOURCETREE_TO_C_INCLUDE_FILE DISABLE
10 6
 */
11 7
 
12 8
 #ifndef _mulle_concurrent_include_h__
13 9
 #define _mulle_concurrent_include_h__
14 10
 
11
+// library: remove with `mark no-header`, rename with `set include`
15 12
 # include <mulle-aba/mulle-aba.h>   // mulle-aba
16 13
 
17 14
 #endif
18
-
... ...
@@ -34,7 +34,7 @@
34 34
 #ifndef mulle_concurrent_h__
35 35
 #define mulle_concurrent_h__
36 36
 
37
-#define MULLE_CONCURRENT_VERSION  ((2 << 20) | (2 << 8) | 3)
37
+#define MULLE_CONCURRENT_VERSION  ((2 << 20) | (2 << 8) | 4)
38 38
 
39 39
 #include "include.h"
40 40
 
... ...
@@ -1,2 +1,2 @@
1 1
 mulle-concurrent;tar;no-all-load,no-import;3EA9AD1D-4EC4-433F-A960-4D865BA3B131;${MULLE_CONCURRENT_URL:-https://github.com/mulle-concurrent/mulle-concurrent/archive/${MULLE_CONCURRENT_BRANCH:-latest}.tar.gz};;;;
2
-mulle-testallocator;tar;no-all-load,no-import,no-singlephase;EFA28AE8-FC43-456F-B56F-281623FCE0EF;${MULLE_TESTALLOCATOR_URL:-https://github.com/mulle-core/mulle-testallocator/archive/${MULLE_TESTALLOCATOR_BRANCH:-latest}.tar.gz};;;;
2
+mulle-testallocator;tar;no-import,no-singlephase;EFA28AE8-FC43-456F-B56F-281623FCE0EF;${MULLE_TESTALLOCATOR_URL:-https://github.com/mulle-core/mulle-testallocator/archive/${MULLE_TESTALLOCATOR_BRANCH:-latest}.tar.gz};;;;
... ...
@@ -23,7 +23,7 @@ then
23 23
    MULLE_HOSTNAME="`PATH=/bin:/usr/bin:/sbin:/usr/sbin hostname -s`"
24 24
    if [ "${MULLE_HOSTNAME:0:1}" = '.' ]
25 25
    then
26
-      MULLE_HOSTNAME="_terodde"
26
+      MULLE_HOSTNAME="_walitza"
27 27
    fi
28 28
    export MULLE_HOSTNAME
29 29
 fi
... ...
@@ -1 +1 @@
1
-2.3.0
1
+2.3.1