From b2623e68a3c1c75e1727227f56783ec3adf20dff Mon Sep 17 00:00:00 2001 From: Kelly Martin Date: Wed, 11 Jul 2012 14:38:04 -0500 Subject: Track submodules --- depends/clsocket | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'depends') diff --git a/depends/clsocket b/depends/clsocket index d0b2d075..c85e9fb3 160000 --- a/depends/clsocket +++ b/depends/clsocket @@ -1 +1 @@ -Subproject commit d0b2d0750dc2d529a152eba4f3f519f69ff7eab0 +Subproject commit c85e9fb35d3510c5dcc367056cda3237d77a7add -- cgit v1.2.1 From 81ea0345ad8f9347ce6ef14bdd779ee1bef438a7 Mon Sep 17 00:00:00 2001 From: Petr Mrázek Date: Fri, 3 Aug 2012 16:09:51 +0200 Subject: Fix cage-related bug in the sort plugin. --- depends/clsocket | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'depends') diff --git a/depends/clsocket b/depends/clsocket index c85e9fb3..d0b2d075 160000 --- a/depends/clsocket +++ b/depends/clsocket @@ -1 +1 @@ -Subproject commit c85e9fb35d3510c5dcc367056cda3237d77a7add +Subproject commit d0b2d0750dc2d529a152eba4f3f519f69ff7eab0 -- cgit v1.2.1 From 509d9570908e1befa537d10285942006d148b3a3 Mon Sep 17 00:00:00 2001 From: Petr Mrázek Date: Fri, 17 Aug 2012 13:02:31 +0200 Subject: Make protobuf behave with multiple build folders involved. --- depends/protobuf/CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'depends') diff --git a/depends/protobuf/CMakeLists.txt b/depends/protobuf/CMakeLists.txt index 570c77b1..24c4b275 100644 --- a/depends/protobuf/CMakeLists.txt +++ b/depends/protobuf/CMakeLists.txt @@ -72,13 +72,13 @@ ELSE() SET(HASH_SET_CLASS hash_set) ENDIF() -CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/config.h.in" "${CMAKE_CURRENT_SOURCE_DIR}/config.h") +CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/config.h") SET(LIBPROTOBUF_LITE_HDRS google/protobuf/io/coded_stream.h google/protobuf/io/coded_stream_inl.h google/protobuf/stubs/common.h -config.h +${CMAKE_CURRENT_BINARY_DIR}/config.h google/protobuf/extension_set.h google/protobuf/generated_message_util.h google/protobuf/stubs/hash.h @@ -207,6 +207,7 @@ ENDIF() INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) SET(PROTOBUF_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}) INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIRS}) +include_directories(${CMAKE_CURRENT_BINARY_DIR}) # Protobuf shared libraries -- cgit v1.2.1