You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@quickstep.apache.org by na...@apache.org on 2016/06/08 22:51:41 UTC
incubator-quickstep git commit: Oops, missed a file
Repository: incubator-quickstep
Updated Branches:
refs/heads/build_shared 7eb9cf762 -> 520b4e035
Oops, missed a file
Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/520b4e03
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/520b4e03
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/520b4e03
Branch: refs/heads/build_shared
Commit: 520b4e0353c4675f9a9fc30d79da6fd7398c2496
Parents: 7eb9cf7
Author: Navneet Potti <na...@gmail.com>
Authored: Wed Jun 8 17:51:23 2016 -0500
Committer: Navneet Potti <na...@gmail.com>
Committed: Wed Jun 8 17:51:23 2016 -0500
----------------------------------------------------------------------
query_optimizer/CMakeLists.txt | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/520b4e03/query_optimizer/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/query_optimizer/CMakeLists.txt b/query_optimizer/CMakeLists.txt
index 5c9438d..8f08130 100644
--- a/query_optimizer/CMakeLists.txt
+++ b/query_optimizer/CMakeLists.txt
@@ -24,6 +24,12 @@ configure_file (
"${CMAKE_CURRENT_BINARY_DIR}/QueryOptimizerConfig.h"
)
+if (BUILD_SHARED_LIBS)
+ set(GFLAGS_LIB_NAME gflags_nothreads-shared)
+else()
+ set(GFLAGS_LIB_NAME gflags_nothreads-static)
+endif()
+
add_subdirectory(cost_model)
add_subdirectory(expressions)
add_subdirectory(logical)
@@ -182,7 +188,7 @@ target_link_libraries(quickstep_queryoptimizer_OptimizerTree
quickstep_utility_Macros
quickstep_utility_TreeStringSerializable)
target_link_libraries(quickstep_queryoptimizer_PhysicalGenerator
- gflags_nothreads-static
+ ${GFLAGS_LIB_NAME}
quickstep_queryoptimizer_LogicalToPhysicalMapper
quickstep_queryoptimizer_logical_Logical
quickstep_queryoptimizer_physical_Physical