diff options
author | Steffen Vogel <post@steffenvogel.de> | 2019-05-02 00:36:47 +0300 |
---|---|---|
committer | vitalyster <vitalyster@gmail.com> | 2019-05-02 18:55:00 +0300 |
commit | 36753323f949f4bb629bb7d6103c8668f18ae297 (patch) | |
tree | f894edbcd59549f1bb917c9be277c4ea56eaca62 /libtransport | |
parent | 37edaf5d4b27582d2c526e2b560a39396bc3f1ad (diff) |
fix code-style in CMakeLists.txt:
- use tabs for indention
- use lower-case commands
- fix superfluous newlines at end of files
Diffstat (limited to 'libtransport')
-rw-r--r-- | libtransport/CMakeLists.txt | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/libtransport/CMakeLists.txt b/libtransport/CMakeLists.txt index d63ffc5e..db7e4318 100644 --- a/libtransport/CMakeLists.txt +++ b/libtransport/CMakeLists.txt @@ -1,66 +1,66 @@ cmake_minimum_required(VERSION 2.6) -FILE(GLOB SRC *.cpp *.h) -FILE(GLOB_RECURSE SWIFTEN_SRC ../include/Swiften/*.cpp) + +file(GLOB SRC *.cpp *.h) +file(GLOB_RECURSE SWIFTEN_SRC ../include/Swiften/*.cpp) # Build without openssl on msvc -if (NOT MSVC) -if (APPLE) - string(REGEX REPLACE "[^;]+;?/Schannel/[^;]+;?" "" SWIFTEN_SRC "${SWIFTEN_SRC}") - string(REGEX REPLACE "[^;]+;?/OpenSSL/[^;]+;?" "" SWIFTEN_SRC "${SWIFTEN_SRC}") -else() - string(REGEX REPLACE "[^;]+;?/Schannel/[^;]+;?" "" SWIFTEN_SRC "${SWIFTEN_SRC}") - string(REGEX REPLACE "[^;]+;?/SecureTransport/[^;]+;?" "" SWIFTEN_SRC "${SWIFTEN_SRC}") -endif() +if(NOT MSVC) + if(APPLE) + string(REGEX REPLACE "[^;]+;?/Schannel/[^;]+;?" "" SWIFTEN_SRC "${SWIFTEN_SRC}") + string(REGEX REPLACE "[^;]+;?/OpenSSL/[^;]+;?" "" SWIFTEN_SRC "${SWIFTEN_SRC}") + else() + string(REGEX REPLACE "[^;]+;?/Schannel/[^;]+;?" "" SWIFTEN_SRC "${SWIFTEN_SRC}") + string(REGEX REPLACE "[^;]+;?/SecureTransport/[^;]+;?" "" SWIFTEN_SRC "${SWIFTEN_SRC}") + endif() else() string(REGEX REPLACE "[^;]+;?/OpenSSL/[^;]+;?" "" SWIFTEN_SRC "${SWIFTEN_SRC}") string(REGEX REPLACE "[^;]+;?/SecureTransport/[^;]+;?" "" SWIFTEN_SRC "${SWIFTEN_SRC}") endif() -FILE(GLOB HEADERS ../include/transport/*.h) + +file(GLOB HEADERS ../include/transport/*.h) include_directories(../spectrum/src/frontends/xmpp/) -if (NOT WIN32) -include_directories(${POPT_INCLUDE_DIR}) +if(NOT WIN32) + include_directories(${POPT_INCLUDE_DIR}) endif() -# SOURCE_GROUP(headers FILES ${HEADERS}) +#source_group(headers FILES ${HEADERS}) - -if (PROTOBUF_FOUND) - if (NOT WIN32) - ADD_LIBRARY(transport SHARED ${HEADERS} ${SRC} ${SWIFTEN_SRC}) +if(PROTOBUF_FOUND) + if(NOT WIN32) + add_library(transport SHARED ${HEADERS} ${SRC} ${SWIFTEN_SRC}) else() - ADD_LIBRARY(transport STATIC ${HEADERS} ${SRC} ${SWIFTEN_SRC}) + add_library(transport STATIC ${HEADERS} ${SRC} ${SWIFTEN_SRC}) endif() -# SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/../include/transport/protocol.pb.cc PROPERTIES GENERATED 1) - ADD_DEPENDENCIES(transport pb) +# set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/../include/transport/protocol.pb.cc PROPERTIES GENERATED 1) + add_dependencies(transport pb) else(PROTOBUF_FOUND) - ADD_LIBRARY(transport SHARED ${HEADERS} ${SRC} ${SWIFTEN_SRC}) + add_library(transport SHARED ${HEADERS} ${SRC} ${SWIFTEN_SRC}) endif(PROTOBUF_FOUND) -# if (CMAKE_COMPILER_IS_GNUCXX) - if (NOT WIN32) - ADD_DEFINITIONS(-fPIC) +# if(CMAKE_COMPILER_IS_GNUCXX) + if(NOT WIN32) + add_definitions(-fPIC) endif() # endif() find_package(CURL) -if (WIN32) +if(WIN32) include_directories("${CMAKE_SOURCE_DIR}/msvc-deps/sqlite3") - TARGET_LINK_LIBRARIES(transport transport-plugin ${PQXX_LIBRARY} ${CURL_LIBRARIES} ${PQ_LIBRARY} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${PROTOBUF_LIBRARY} ${JSONCPP_LIBRARY} psapi.lib bcrypt.lib) + target_link_libraries(transport transport-plugin ${PQXX_LIBRARY} ${CURL_LIBRARIES} ${PQ_LIBRARY} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${PROTOBUF_LIBRARY} ${JSONCPP_LIBRARY} psapi.lib bcrypt.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} ${JSONCPP_LIBRARY}) + target_link_libraries(transport transport-plugin ${PQXX_LIBRARY} ${CURL_LIBRARIES} ${PQ_LIBRARY} ${SQLITE3_LIBRARIES} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${POPT_LIBRARY} ${PROTOBUF_LIBRARY} ${JSONCPP_LIBRARY}) endif() -SET_TARGET_PROPERTIES(transport PROPERTIES - VERSION ${TRANSPORT_VERSION} SOVERSION ${TRANSPORT_VERSION} +set_target_properties(transport PROPERTIES + VERSION ${TRANSPORT_VERSION} SOVERSION ${TRANSPORT_VERSION} ) -if (APPLE) - TARGET_LINK_LIBRARIES(transport ${APPLE_FRAMEWORKS}) +if(APPLE) + target_link_libraries(transport ${APPLE_FRAMEWORKS}) endif() +install(TARGETS transport LIBRARY DESTINATION ${LIB_install_DIR} ARCHIVE DESTINATION ${LIB_install_DIR} COMPONENT libraries) -INSTALL(TARGETS transport LIBRARY DESTINATION ${LIB_INSTALL_DIR} ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT libraries) - -#CONFIGURE_FILE(transport.pc.in "${CMAKE_CURRENT_BINARY_DIR}/transport.pc") -#INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/transport.pc" DESTINATION lib/pkgconfig) +#configure_file(transport.pc.in "${CMAKE_CURRENT_BINARY_DIR}/transport.pc") +#install(FILES "${CMAKE_CURRENT_BINARY_DIR}/transport.pc" DESTINATION lib/pkgconfig) |