Merge pull request #8328 from Michael-Gardner/HPCC-15053

HPCC-15053 Changes to add_subdirectory dependencies for jlib

Reviewed-By: Xiaoming Wang <xiaoming.wang@lexisnexis.com>
Reviewed-By: Mark Kelly <mark.kelly@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>

CMakeLists.txt

@@ -115,8 +115,6 @@ if ( PLUGIN )
     HPCC_ADD_SUBDIRECTORY (roxie/roxiemem)
     HPCC_ADD_SUBDIRECTORY (rtl/nbcd)
     HPCC_ADD_SUBDIRECTORY (rtl/eclrtl)
-    HPCC_ADD_SUBDIRECTORY (system/lzma)
-    HPCC_ADD_SUBDIRECTORY (system/lz4_sm)
     HPCC_ADD_SUBDIRECTORY (system/jlib)
     HPCC_ADD_SUBDIRECTORY (dali/base)
     HPCC_ADD_SUBDIRECTORY (common/workunit "CASSANDRAEMBED")

system/CMakeLists.txt

@@ -17,8 +17,6 @@ HPCC_ADD_SUBDIRECTORY (hrpc)
 HPCC_ADD_SUBDIRECTORY (include "PLATFORM")
 HPCC_ADD_SUBDIRECTORY (jhtree)
 HPCC_ADD_SUBDIRECTORY (jlib)
-HPCC_ADD_SUBDIRECTORY (lz4_sm)
-HPCC_ADD_SUBDIRECTORY (lzma)
 HPCC_ADD_SUBDIRECTORY (mp)
 HPCC_ADD_SUBDIRECTORY (security)
 HPCC_ADD_SUBDIRECTORY (xmllib)

system/jlib/CMakeLists.txt

@@ -30,6 +30,15 @@ CHECK_LIBRARY_EXISTS(dl dlopen "" HAVE_LIBDL)
 CHECK_LIBRARY_EXISTS(crypt crypt "" HAVE_LIBCRYPT) 
 endif ()
 
+if(NOT TARGET lzma)
+  add_subdirectory(../lzma ${CMAKE_BINARY_DIR}/system/lzma)
+endif(NOT TARGET lzma)
+
+if(NOT TARGET lz4)
+  add_subdirectory(../lz4_sm ${CMAKE_BINARY_DIR}/system/lz4_sm)
+endif(NOT TARGET lz4)
+
+
 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")
 endif()