File tree Expand file tree Collapse file tree 1 file changed +9
-7
lines changed Expand file tree Collapse file tree 1 file changed +9
-7
lines changed Original file line number Diff line number Diff line change @@ -76,16 +76,18 @@ add_library(lib_ACE SHARED ${lib_ACE_src})
76
76
add_library (lib_ACE-static STATIC ${lib_ACE_src} )
77
77
78
78
# ============= link ace's library with dependencies
79
- if (ANDROID )
80
- # link with main android library
81
- target_link_libraries (lib_ACE PRIVATE common_flag android log cppzmq-static linenoise-static )
82
- target_link_libraries (lib_ACE-static PRIVATE common_flag android log cppzmq-static linenoise-static )
83
- else ()
84
- target_link_libraries (lib_ACE PRIVATE common_flag cppzmq-static linenoise-static )
85
- target_link_libraries (lib_ACE-static PRIVATE common_flag cppzmq-static linenoise-static )
79
+ # libraries that lib_ACE need
80
+ set (lib_ACE_linked_libraries common_flag cppzmq-static linenoise-static )
86
81
82
+ message ("linked libraries: ${lib_ACE_linked_libraries} " )
83
+ # add extra library to link to for android (logging and etc)
84
+ if (ANDROID )
85
+ list (APPEND lib_ACE_linked_libraries android log )
87
86
endif ()
88
87
88
+ target_link_libraries (lib_ACE PRIVATE ${lib_ACE_linked_libraries} )
89
+ target_link_libraries (lib_ACE-static PRIVATE ${lib_ACE_linked_libraries} )
90
+
89
91
# ================================================================================
90
92
# for unit testing the the file's utils copy necessary files into the build
91
93
# folder Just in case that it is built in a different directory
You can’t perform that action at this time.
0 commit comments