From 54db2e651c55c4a04c0e5eb82c2e981cdf65e565 Mon Sep 17 00:00:00 2001
From: Dmitry Simonenko <pmwkaa@gmail.com>
Date: Thu, 22 May 2014 12:33:30 +0400
Subject: [PATCH] sophia: build static library only
Conflicts:
cmake/BuildSophia.cmake
---
cmake/BuildSophia.cmake | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/cmake/BuildSophia.cmake b/cmake/BuildSophia.cmake
index 4cb41d7fab..ef36158b9a 100644
--- a/cmake/BuildSophia.cmake
+++ b/cmake/BuildSophia.cmake
@@ -6,7 +6,8 @@ macro(sophia_build)
if (${PROJECT_BINARY_DIR} STREQUAL ${PROJECT_SOURCE_DIR})
add_custom_command(OUTPUT ${PROJECT_SOURCE_DIR}/third_party/sophia/db/libsophia.a
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/third_party/sophia
- COMMAND $(MAKE) -C db
+ COMMAND $(MAKE) -C db libsophia.a
+ DEPENDS ${CMAKE_SOURCE_DIR}/CMakeCache.txt
)
else()
add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/third_party/sophia
@@ -14,8 +15,8 @@ macro(sophia_build)
)
add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/third_party/sophia/db/libsophia.a
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/third_party/sophia
- COMMAND cp -r ${PROJECT_SOURCE_DIR}/third_party/sophia/* .
- COMMAND $(MAKE) -C db
+ COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJECT_SOURCE_DIR}/third_party/sophia ${PROJECT_BINARY_DIR}/third_party/sophia
+ COMMAND $(MAKE) -C db libsophia.a
DEPENDS ${PROJECT_BINARY_DIR}/CMakeCache.txt ${PROJECT_BINARY_DIR}/third_party/sophia
)
endif()
--
GitLab