|
@@ -30,8 +30,6 @@ CHECK_LIBRARY_EXISTS(dl dlopen "" HAVE_LIBDL)
|
|
CHECK_LIBRARY_EXISTS(crypt crypt "" HAVE_LIBCRYPT)
|
|
CHECK_LIBRARY_EXISTS(crypt crypt "" HAVE_LIBCRYPT)
|
|
endif ()
|
|
endif ()
|
|
|
|
|
|
-add_subdirectory(${HPCC_SOURCE_DIR}/system/libyaml ${CMAKE_BINARY_DIR}/system/libyaml)
|
|
|
|
-
|
|
|
|
if(NOT TARGET lzma)
|
|
if(NOT TARGET lzma)
|
|
add_subdirectory(${HPCC_SOURCE_DIR}/system/lzma ${CMAKE_BINARY_DIR}/system/lzma)
|
|
add_subdirectory(${HPCC_SOURCE_DIR}/system/lzma ${CMAKE_BINARY_DIR}/system/lzma)
|
|
endif(NOT TARGET lzma)
|
|
endif(NOT TARGET lzma)
|
|
@@ -195,7 +193,7 @@ include_directories (
|
|
${HPCC_SOURCE_DIR}/system/lz4_sm/lz4/lib
|
|
${HPCC_SOURCE_DIR}/system/lz4_sm/lz4/lib
|
|
${HPCC_SOURCE_DIR}/system/globalid
|
|
${HPCC_SOURCE_DIR}/system/globalid
|
|
${HPCC_SOURCE_DIR}/system/security/cryptohelper
|
|
${HPCC_SOURCE_DIR}/system/security/cryptohelper
|
|
- ${HPCC_SOURCE_DIR}/system/libyaml/include
|
|
|
|
|
|
+ ${HPCC_SOURCE_DIR}/system/yaml/libyaml/include
|
|
${CMAKE_CURRENT_BINARY_DIR} # for generated jelog.h file
|
|
${CMAKE_CURRENT_BINARY_DIR} # for generated jelog.h file
|
|
${CMAKE_BINARY_DIR}
|
|
${CMAKE_BINARY_DIR}
|
|
${CMAKE_BINARY_DIR}/oss
|
|
${CMAKE_BINARY_DIR}/oss
|