stv0g/spectrum2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix compilation 4

Browse source
This commit is contained in:
Vitaly Takmazov 2012-04-16 14:21:55 +04:00
parent f1d9579afa
commit 27004b5fc7
3 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -48,6 +48,7 @@ find_package(Swiften)
if (CMAKE_COMPILER_IS_GNUCXX) if (CMAKE_COMPILER_IS_GNUCXX)
set(openssl_DIR "${CMAKE_SOURCE_DIR}/cmake_modules") set(openssl_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
find_package(openssl) find_package(openssl)
endif()
set(Boost_DIR "${CMAKE_SOURCE_DIR}/cmake_modules") set(Boost_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
if (WIN32) if (WIN32)

2
cmake_modules/CommuniConfig.cmake
View file

@ -1,4 +1,4 @@
find_package(Qt4 REQUIRED) find_package(Qt4)
include( ${QT_USE_FILE} ) include( ${QT_USE_FILE} )
FIND_LIBRARY(IRC_LIBRARY NAMES Communi PATHS ${QT_LIBRARY_DIR}) FIND_LIBRARY(IRC_LIBRARY NAMES Communi PATHS ${QT_LIBRARY_DIR})

13
src/CMakeLists.txt
View file

@ -44,11 +44,16 @@ if (CMAKE_COMPILER_IS_GNUCXX)
endif() endif()
endif() endif()
if (NOT CMAKE_COMPILER_IS_GNUCXX)
include_directories("${CMAKE_SOURCE_DIR}/msvc-deps/protobuf/libprotobuf")
TARGET_LINK_LIBRARIES(transport transport-plugin sqlite3 libprotobuf ${PQXX_LIBRARY} ${PQ_LIBRARY} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES})
else ()
if (WIN32) if (WIN32)
TARGET_LINK_LIBRARIES(transport transport-plugin ${PQXX_LIBRARY} ${PQ_LIBRARY} ${SQLITE3_LIBRARIES} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES}) TARGET_LINK_LIBRARIES(transport transport-plugin sqlite3 ${PQXX_LIBRARY} ${PQ_LIBRARY} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${PROTOBUF_LIBRARIES})
else (WIN32) else()
TARGET_LINK_LIBRARIES(transport transport-plugin ${PQXX_LIBRARY} ${PQ_LIBRARY} ${SQLITE3_LIBRARIES} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${POPT_LIBRARY}) TARGET_LINK_LIBRARIES(transport transport-plugin ${PQXX_LIBRARY} ${PQ_LIBRARY} ${SQLITE3_LIBRARIES} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${PROTOBUF_LIBRARIES} ${LOG4CXX_LIBRARIES} ${POPT_LIBRARY})
endif(WIN32) endif()
endif()
SET_TARGET_PROPERTIES(transport PROPERTIES SET_TARGET_PROPERTIES(transport PROPERTIES
VERSION ${TRANSPORT_VERSION} SOVERSION ${TRANSPORT_VERSION} VERSION ${TRANSPORT_VERSION} SOVERSION ${TRANSPORT_VERSION}