From 8b1f660078601bb7ddb1318e6158047fb7fd7adb Mon Sep 17 00:00:00 2001 From: Jan Kaluza Date: Tue, 4 Sep 2012 16:19:03 +0200 Subject: [PATCH] Add PROTOBUF_PROTOC_EXECUTABLE --- CMakeLists.txt | 4 ++++ include/transport/CMakeLists.txt | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fe311068..ba47cab9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,6 +10,7 @@ message(STATUS " |-libidn : -DLIBIDN_LIBRARY") message(STATUS " |-libxml : -DLIBXML_LIBRARY") message(STATUS "|- boost : -DBOOST_INCLUDEDIR, -DBOOST_LIBRARYDIR") message(STATUS "|- protobuf: -DPROTOBUF_INCLUDE_DIR, -DPROTOBUF_LIBRARY") +message(STATUS " : -DPROTOBUF_PROTOC_EXECUTABLE") message(STATUS "|- log4cxx : -DLOG4CXX_INCLUDE_DIR, -DLOG4CXX_LIBRARY") message(STATUS "|- purple : -DPURPLE_INCLUDE_DIR, -DPURPLE_LIBRARY") message(STATUS " : -DPURPLE_NOT_RUNTIME - enables compilation with libpurple.lib") @@ -143,6 +144,9 @@ message( STATUS "Found Boost: ${Boost_LIBRARIES}, ${Boost_INCLUDE_DIR}") if (WIN32 AND PROTOBUF_INCLUDE_DIR AND PROTOBUF_LIBRARY) set(PROTOBUF_FOUND 1) set(PROTOBUF_INCLUDE_DIRS ${PROTOBUF_INCLUDE_DIR}) + if (NOT PROTOBUF_PROTOC_EXECUTABLE) + set(PROTOBUF_PROTOC_EXECUTABLE protoc) + endif() message(STATUS "Using protobuf: ${PROTOBUF_INCLUDE_DIRS} ${PROTOBUF_LIBRARY}") else() if (WIN32) diff --git a/include/transport/CMakeLists.txt b/include/transport/CMakeLists.txt index 531baa9a..104a2206 100644 --- a/include/transport/CMakeLists.txt +++ b/include/transport/CMakeLists.txt @@ -1,7 +1,4 @@ if (PROTOBUF_FOUND) - if (NOT CMAKE_COMPILER_IS_GNUCXX) - set (PROTOBUF_PROTOC_EXECUTABLE protoc) - endif() ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/protocol.pb.cc ${CMAKE_CURRENT_SOURCE_DIR}/protocol.pb.h COMMAND ${PROTOBUF_PROTOC_EXECUTABLE} --cpp_out ${CMAKE_CURRENT_SOURCE_DIR} --proto_path ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/protocol.proto