From 533ab1b3f3f4286aa756e965e22aa88612479e01 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Fri, 23 Feb 2018 01:44:44 -0800 Subject: [PATCH 1/3] third-party --- thirdparty.inc | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/thirdparty.inc b/thirdparty.inc index a364d1d..1d85d50 100644 --- a/thirdparty.inc +++ b/thirdparty.inc @@ -19,10 +19,10 @@ set (THIRDPARTY_LIBS "") # Initialization, don't touch # # Edit these 4 lines to define paths to GFLAGS # -set(GFLAGS_HOME $ENV{THIRDPARTY_HOME}/Gflags.Library) -set(GFLAGS_INCLUDE ${GFLAGS_HOME}/inc/include) -set(GFLAGS_LIB_DEBUG ${GFLAGS_HOME}/bin/debug/amd64/gflags.lib) -set(GFLAGS_LIB_RELEASE ${GFLAGS_HOME}/bin/retail/amd64/gflags.lib) +set(GFLAGS_HOME ${CURRENT_INSTALLED_DIR}) +set(GFLAGS_INCLUDE ${GFLAGS_HOME}/include) +find_library(GFLAGS_LIB_DEBUG NAMES gflags gflags_static) +set(GFLAGS_LIB_RELEASE ${GFLAGS_LIB_DEBUG}) # ================================================== GFLAGS ================================================== # @@ -63,10 +63,10 @@ endif () # # Edit these 4 lines to define paths to Snappy # -set(SNAPPY_HOME $ENV{THIRDPARTY_HOME}/Snappy.Library) -set(SNAPPY_INCLUDE ${SNAPPY_HOME}/inc/inc) -set(SNAPPY_LIB_DEBUG ${SNAPPY_HOME}/bin/debug/amd64/snappy.lib) -set(SNAPPY_LIB_RELEASE ${SNAPPY_HOME}/bin/retail/amd64/snappy.lib) +set(SNAPPY_HOME ${CURRENT_INSTALLED_DIR}) +set(SNAPPY_INCLUDE ${SNAPPY_HOME}/include) +set(SNAPPY_LIB_DEBUG ${SNAPPY_HOME}/debug/lib/snappy.lib) +set(SNAPPY_LIB_RELEASE ${SNAPPY_HOME}/lib/snappy.lib) # # Don't touch these lines @@ -106,10 +106,10 @@ endif () # # Edit these 4 lines to define paths to LZ4 # -set(LZ4_HOME $ENV{THIRDPARTY_HOME}/LZ4.Library) -set(LZ4_INCLUDE ${LZ4_HOME}/inc/include) -set(LZ4_LIB_DEBUG ${LZ4_HOME}/bin/debug/amd64/lz4.lib) -set(LZ4_LIB_RELEASE ${LZ4_HOME}/bin/retail/amd64/lz4.lib) +set(LZ4_HOME ${CURRENT_INSTALLED_DIR}) +set(LZ4_INCLUDE ${LZ4_HOME}/include) +set(LZ4_LIB_DEBUG ${LZ4_HOME}/debug/lib/lz4.lib) +set(LZ4_LIB_RELEASE ${LZ4_HOME}/lib/lz4.lib) # # Don't touch these lines @@ -149,10 +149,10 @@ endif () # # Edit these 4 lines to define paths to ZLIB # -set(ZLIB_HOME $ENV{THIRDPARTY_HOME}/ZLIB.Library) -set(ZLIB_INCLUDE ${ZLIB_HOME}/inc/include) -set(ZLIB_LIB_DEBUG ${ZLIB_HOME}/bin/debug/amd64/zlib.lib) -set(ZLIB_LIB_RELEASE ${ZLIB_HOME}/bin/retail/amd64/zlib.lib) +set(ZLIB_HOME ${CURRENT_INSTALLED_DIR}) +set(ZLIB_INCLUDE ${ZLIB_HOME}/include) +set(ZLIB_LIB_DEBUG ${ZLIB_HOME}/debug/lib/zlibd.lib) +set(ZLIB_LIB_RELEASE ${ZLIB_HOME}/lib/zlib.lib) # # Don't touch these lines -- 2.16.2.windows.1