From f385917a9034fb073799ae2ef4e401d1c46705e3 Mon Sep 17 00:00:00 2001 From: Max-Wilhelm Bruker Date: Sat, 21 Jan 2012 20:38:16 +0100 Subject: [PATCH] Win32 compile fix --- cockatrice/CMakeLists.txt | 1 + common/CMakeLists.txt | 2 ++ 2 files changed, 3 insertions(+) diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt index 3a0d3ea0..215f61fd 100644 --- a/cockatrice/CMakeLists.txt +++ b/cockatrice/CMakeLists.txt @@ -183,6 +183,7 @@ QT4_ADD_RESOURCES(cockatrice_RESOURCES_RCC ${cockatrice_RESOURCES}) INCLUDE(${QT_USE_FILE}) INCLUDE_DIRECTORIES(../common) +INCLUDE_DIRECTORIES(${PROTOBUF_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../common) INCLUDE_DIRECTORIES(${QT_MOBILITY_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${QT_MOBILITY_MULTIMEDIAKIT_INCLUDE_DIR}) diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index 41de51fd..1b35a2e1 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -31,6 +31,7 @@ SET(common_HEADERS ) FIND_PACKAGE(Qt4 REQUIRED) +FIND_PACKAGE(Protobuf REQUIRED) set(CMAKE_BUILD_TYPE Release) @@ -38,6 +39,7 @@ QT4_WRAP_CPP(common_HEADERS_MOC ${common_HEADERS}) INCLUDE(${QT_USE_FILE}) INCLUDE_DIRECTORIES(pb) INCLUDE_DIRECTORIES(sfmt) +INCLUDE_DIRECTORIES(${PROTOBUF_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) add_subdirectory(pb)