From 48bcd9b88aa3003446a45eb2572f509a9827d658 2013-01-10 20:18:40 From: Daniel Henninger Date: 2013-01-10 20:18:40 Subject: [PATCH] Applied _vt's patch for windows twitter build --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 9a10d6c95b71404d92e6accf73f893adc3fa467f..aea57c9c58c657e8914a371f2d33509c403fe317 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -110,7 +110,7 @@ endif() # FIND SQLITE3 if (ENABLE_SQLITE3) if (NOT CMAKE_COMPILER_IS_GNUCXX) - ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/msvc-deps/sqlite3) + ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/msvc-deps) else() if (WIN32) ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/msvc-deps/sqlite3) diff --git a/backends/twitter/CMakeLists.txt b/backends/twitter/CMakeLists.txt index 26da4cb7b2864645b819e9d0c1ef0a2bab161b83..7853267e855c5557232d02180b43b915e6a480ee 100644 --- a/backends/twitter/CMakeLists.txt +++ b/backends/twitter/CMakeLists.txt @@ -5,7 +5,8 @@ add_executable(spectrum2_twitter_backend ${SRC}) if (NOT WIN32) target_link_libraries(spectrum2_twitter_backend curl transport pthread ${Boost_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES}) else () -target_link_libraries(spectrum2_twitter_backend libcurl_imp transport ${Boost_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES}) +include_directories("${CMAKE_SOURCE_DIR}/msvc-deps/curl/include") +target_link_libraries(spectrum2_twitter_backend libcurl transport ${Boost_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES}) endif() INSTALL(TARGETS spectrum2_twitter_backend RUNTIME DESTINATION bin)