Merge pull request #10766 from Michael-Gardner/HPCC-18947

HPCC-18947 Libbase58 linking for jlib in plugins builds

Reviewed-By: Anthony Fishbeck <anthony.fishbeck@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>

system/CMakeLists.txt

@@ -19,7 +19,6 @@ HPCC_ADD_SUBDIRECTORY (jhtree)
 HPCC_ADD_SUBDIRECTORY (jlib)
 
 if (NOT JLIB_ONLY)
-   HPCC_ADD_SUBDIRECTORY (libbase58)
    HPCC_ADD_SUBDIRECTORY (hrpc)
    HPCC_ADD_SUBDIRECTORY (tbb_sm)
    HPCC_ADD_SUBDIRECTORY (mp)

system/jlib/CMakeLists.txt

@@ -38,6 +38,9 @@ if(NOT TARGET lz4)
   add_subdirectory(../lz4_sm ${CMAKE_BINARY_DIR}/system/lz4_sm)
 endif(NOT TARGET lz4)
 
+if(NOT TARGET libbase58)
+  add_subdirectory(../libbase58 ${CMAKE_BINARY_DIR}/system/libbase58)
+endif(NOT TARGET libbase58)
 
 if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG)
   SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-switch -Wno-unused-parameter -Werror -Wno-error=delete-non-virtual-dtor")