libtransport.git Changeset - 573cd5a4bbfb

Parent rev.

Child rev.

[Not reviewed]

! ! !

Vitaly Takmazov - 8 years ago 2018-02-13 07:16:36
vitalyster@gmail.com

drop outdated msvc dependencies

12 files changed:

.gitmodules

CMakeLists.txt

libtransport/CMakeLists.txt

msvc-deps/CMakeLists.txt

msvc-deps/curl

msvc-deps/protobuf/CMakeLists.txt

msvc-deps/protobuf/libprotobuf/CMakeLists.txt

msvc-deps/protobuf/libprotobuf/config.h

msvc-deps/protobuf/libprotobuf/google/protobuf/compiler/importer.cc

459

msvc-deps/protobuf/libprotobuf/google/protobuf/compiler/importer.h

303

msvc-deps/protobuf/libprotobuf/google/protobuf/compiler/parser.cc

1473

msvc-deps/protobuf/libprotobuf/google/protobuf/compiler/parser.h

434

Changeset was too big and was cut off... Show full diff anyway

0 comments (0 inline, 0 general)

.gitmodules

➞

Show inline comments

deleted file

CMakeLists.txt

➞

Show inline comments

@@ @@ -106,17 +106,8 @@ endif() @@
 # FIND SQLITE3
 if (ENABLE_SQLITE3)
 	if (MSVC)
 		set(SQLITE3_FOUND 1)
 		ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/msvc-deps)
 	else()
 		if (WIN32)
 			ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/msvc-deps/sqlite3)
 		else()
 			set(sqlite3_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 			find_package(sqlite3)
 		endif()
 	endif()
 	set(sqlite3_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 	find_package(sqlite3)
 endif()
 # FIND MYSQL

libtransport/CMakeLists.txt

➞

Show inline comments

@@ @@ -47,7 +47,7 @@ find_package(CURL) @@
 if (WIN32)
 	include_directories("${CMAKE_SOURCE_DIR}/msvc-deps/sqlite3")
-	TARGET_LINK_LIBRARIES(transport transport-plugin sqlite3 ${PQXX_LIBRARY} ${CURL_LIBRARIES} ${PQ_LIBRARY} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${PROTOBUF_LIBRARY} psapi.lib)
 	TARGET_LINK_LIBRARIES(transport transport-plugin ${PQXX_LIBRARY} ${CURL_LIBRARIES} ${PQ_LIBRARY} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${PROTOBUF_LIBRARY} psapi.lib)
 else()
 	TARGET_LINK_LIBRARIES(transport transport-plugin ${PQXX_LIBRARY} ${CURL_LIBRARIES} ${PQ_LIBRARY} ${SQLITE3_LIBRARIES} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${POPT_LIBRARY} ${PROTOBUF_LIBRARY})
 endif()

msvc-deps/CMakeLists.txt

➞

Show inline comments

deleted file

msvc-deps/curl

➞

Show inline comments

deleted file

msvc-deps/protobuf/CMakeLists.txt

➞

Show inline comments

deleted file

msvc-deps/protobuf/libprotobuf/CMakeLists.txt

➞

Show inline comments

deleted file

msvc-deps/protobuf/libprotobuf/config.h

➞

Show inline comments

deleted file

msvc-deps/protobuf/libprotobuf/google/protobuf/compiler/importer.cc

➞

Show inline comments

deleted file

msvc-deps/protobuf/libprotobuf/google/protobuf/compiler/importer.h

➞

Show inline comments

deleted file

msvc-deps/protobuf/libprotobuf/google/protobuf/compiler/parser.cc

➞

Show inline comments

deleted file

msvc-deps/protobuf/libprotobuf/google/protobuf/compiler/parser.h

➞

Show inline comments

deleted file

Changeset was too big and was cut off... Show full diff anyway

0 comments (0 inline, 0 general)