libtransport.git Changeset - 8b1f66007860

Changeset - 8b1f66007860

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Jan Kaluza - 13 years ago 2012-09-04 16:19:03
hanzz.k@gmail.com

Add PROTOBUF_PROTOC_EXECUTABLE

2 files changed with 4 insertions and 3 deletions:

CMakeLists.txt

include/transport/CMakeLists.txt

0 comments (0 inline, 0 general)

CMakeLists.txt

➞

Show inline comments

 message(STATUS "  |- zlib  :                         -DZLIB_LIBRARY")
 message(STATUS "  |- expat :                         -DEXPAT_LIBRARY")
 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")
 message(STATUS "|- glib2   : -DGLIB2_INCLUDE_DIR,    -DGLIB2_LIBRARIES")
 if(NOT LIB_INSTALL_DIR)
@@ @@ -140,12 +141,15 @@ endif(WIN32) @@
 message( STATUS "Found Boost: ${Boost_LIBRARIES}, ${Boost_INCLUDE_DIR}")
 # FIND PROTOBUF
 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)
 		#TODO: Use bundled protobuf here...?
 		set(PROTOBUF_FOUND 1)
 		set(PROTOBUF_INCLUDE_DIRS "../include")

include/transport/CMakeLists.txt

➞

Show inline comments

 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
         COMMENT "Running C++ protocol buffer compiler on protocol.proto"
         DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/protocol.proto
+    )

0 comments (0 inline, 0 general)