From 9aba55b0a0170d81d404c84b552de3dae4624bb4 Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Mon, 16 Apr 2012 11:19:52 +0400 Subject: [PATCH] fix compilation 3 --- spectrum/src/CMakeLists.txt | 2 +- src/CMakeLists.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spectrum/src/CMakeLists.txt b/spectrum/src/CMakeLists.txt index 2981011c..b0e9d42e 100644 --- a/spectrum/src/CMakeLists.txt +++ b/spectrum/src/CMakeLists.txt @@ -7,7 +7,7 @@ ADD_DEPENDENCIES(spectrum2 spectrum2_libpurple_backend) ADD_DEPENDENCIES(spectrum2 spectrum2_libircclient-qt_backend) target_link_libraries(spectrum2 transport ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES}) -if (WIN32) +if (NOT CMAKE_COMPILER_IS_GNUCXX) target_link_libraries(spectrum2 libprotobuf) endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f739c45f..c3e301da 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -27,11 +27,11 @@ endif() if (PROTOBUF_FOUND) - if (CMAKE_COMPILER_IS_GNUCXX) + if (NOT WIN32) ADD_LIBRARY(transport SHARED ${HEADERS} ${SRC} ${SWIFTEN_SRC}) - else(CMAKE_COMPILER_IS_GNUCXX) + else() ADD_LIBRARY(transport STATIC ${HEADERS} ${SRC} ${SWIFTEN_SRC}) - endif(CMAKE_COMPILER_IS_GNUCXX) + endif() # SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/../include/transport/protocol.pb.cc PROPERTIES GENERATED 1) ADD_DEPENDENCIES(transport pb) else(PROTOBUF_FOUND)