Commit 80bea9b1 authored by Pere Mato Vila's avatar Pere Mato Vila
Browse files

Avoid hardwiring /lib64 and simplifications

parent 5ff8e7ca
Pipeline #1255439 passed with stage
in 5 minutes and 4 seconds
...@@ -53,20 +53,7 @@ LCGPackage_Add( ...@@ -53,20 +53,7 @@ LCGPackage_Add(
-DARROW_PARQUET=ON -DARROW_PARQUET=ON
-DARROW_JEMALLOC=OFF -DARROW_JEMALLOC=OFF
-DARROW_USE_CCACHE=OFF -DARROW_USE_CCACHE=OFF
-DRapidJSON_ROOT=${rapidjson_home} -DRAPIDJSON_INCLUDE_DIR=${rapidjson_home}/include # RapidJSONConfig.cmake defines only RAPIDJSON_INCLUDE_DIRS
-DRAPIDJSON_INCLUDE_DIR=${rapidjson_home}/include
-DGLOG_ROOT=${glog_home}
-DGLOG_INCLUDE_DIR=${glog_home}/include
-DTHRIFT_ROOT=${thrift_home}
-DTHRIFT_INCLUDE_DIR=${thrift_home}/include
-DTHRIFT_COMPILER=${thrift_home}/bin/thrift
IF ${CMAKE_BUILD_TYPE} MATCHES "Debug" THEN
-DGLOG_LIB=${glog_home}/lib64/libglogd.a
-DTHRIFT_STATIC_LIB=${thrift_home}/lib/libthriftd.a
ELSE
-DGLOG_LIB=${glog_home}/lib64/libglog.a
-DTHRIFT_STATIC_LIB=${thrift_home}/lib/libthrift.a
ENDIF
"-DCXX_COMMON_FLAGS=-march=core2 -mno-sse4.2 -mno-bmi2 -mno-bmi -mno-sse3 -mno-ssse3" "-DCXX_COMMON_FLAGS=-march=core2 -mno-sse4.2 -mno-bmi2 -mno-bmi -mno-sse3 -mno-ssse3"
"-DARROW_CXXFLAGS=-march=core2 -mno-sse4.2 -mno-bmi2 -mno-bmi -mno-sse3 -mno-ssse3" "-DARROW_CXXFLAGS=-march=core2 -mno-sse4.2 -mno-bmi2 -mno-bmi -mno-sse3 -mno-ssse3"
${Boost_extra_configuration} ${Boost_extra_configuration}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment