Avoid relying on symlink for include directories
Symlinks aren't working very well with Git under Windows so better avoid them.
This commit is contained in:
parent
5f44e2b49e
commit
96e92f13a3
|
@ -32,7 +32,7 @@ Makefile*
|
||||||
*.qmlproject.user.*
|
*.qmlproject.user.*
|
||||||
|
|
||||||
# Go modules
|
# Go modules
|
||||||
/libsyncthing/go/pkg
|
/syncthing/go/pkg
|
||||||
|
|
||||||
# Dolphin
|
# Dolphin
|
||||||
.directory
|
.directory
|
||||||
|
@ -47,12 +47,12 @@ testfiles/output.*
|
||||||
scripts/
|
scripts/
|
||||||
|
|
||||||
# clang-format
|
# clang-format
|
||||||
/libsyncthing/.clang-format
|
/syncthing/.clang-format
|
||||||
/cli/.clang-format
|
/cli/.clang-format
|
||||||
/connector/.clang-format
|
/syncthingconnector/.clang-format
|
||||||
/fileitemactionplugin/.clang-format
|
/fileitemactionplugin/.clang-format
|
||||||
/model/.clang-format
|
/syncthingmodel/.clang-format
|
||||||
/testhelper/.clang-format
|
/testhelper/.clang-format
|
||||||
/tray/.clang-format
|
/tray/.clang-format
|
||||||
/plasmoid/lib/.clang-format
|
/plasmoid/lib/.clang-format
|
||||||
/widgets/.clang-format
|
/syncthingwidgets/.clang-format
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
[submodule "libsyncthing/go/src/github.com/syncthing/syncthing"]
|
[submodule "libsyncthing/go/src/github.com/syncthing/syncthing"]
|
||||||
path = libsyncthing/go/src/github.com/syncthing/syncthing
|
path = syncthing/go/src/github.com/syncthing/syncthing
|
||||||
url = https://github.com/Martchus/syncthing.git
|
url = https://github.com/Martchus/syncthing.git
|
||||||
branch = libsyncthing
|
branch = libsyncthing
|
||||||
|
|
|
@ -57,29 +57,26 @@ else()
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# set the include directory used when building so the headers of the different backend libraries can be found at build time
|
|
||||||
set(TARGET_INCLUDE_DIRECTORY_BUILD_INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/include")
|
|
||||||
|
|
||||||
set(PACKAGE_NAMESPACE "" CACHE STRING "sets the prefix for find_package() calls to packages configured via c++utilities")
|
set(PACKAGE_NAMESPACE "" CACHE STRING "sets the prefix for find_package() calls to packages configured via c++utilities")
|
||||||
if (PACKAGE_NAMESPACE)
|
if (PACKAGE_NAMESPACE)
|
||||||
set(PACKAGE_NAMESPACE_PREFIX "${PACKAGE_NAMESPACE}-")
|
set(PACKAGE_NAMESPACE_PREFIX "${PACKAGE_NAMESPACE}-")
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
# add subdirectories
|
# add subdirectories
|
||||||
add_subdirectory(connector)
|
add_subdirectory(syncthingconnector)
|
||||||
add_subdirectory(testhelper)
|
add_subdirectory(testhelper)
|
||||||
if (NOT NO_LIBSYNCTHING)
|
if (NOT NO_LIBSYNCTHING)
|
||||||
add_subdirectory(libsyncthing)
|
add_subdirectory(syncthing)
|
||||||
endif()
|
endif()
|
||||||
link_directories(${LIB_SYNCTHING_CONNECTOR_BINARY_DIR})
|
link_directories(${LIB_SYNCTHING_CONNECTOR_BINARY_DIR})
|
||||||
if(NOT NO_CLI)
|
if(NOT NO_CLI)
|
||||||
add_subdirectory(cli)
|
add_subdirectory(cli)
|
||||||
endif()
|
endif()
|
||||||
if(NOT NO_MODEL)
|
if(NOT NO_MODEL)
|
||||||
add_subdirectory(model)
|
add_subdirectory(syncthingmodel)
|
||||||
link_directories(${LIB_SYNCTHING_MODEL_BINARY_DIR})
|
link_directories(${LIB_SYNCTHING_MODEL_BINARY_DIR})
|
||||||
if(NOT NO_WIDGETS)
|
if(NOT NO_WIDGETS)
|
||||||
add_subdirectory(widgets)
|
add_subdirectory(syncthingwidgets)
|
||||||
if(NOT NO_TRAY)
|
if(NOT NO_TRAY)
|
||||||
add_subdirectory(tray)
|
add_subdirectory(tray)
|
||||||
endif()
|
endif()
|
||||||
|
|
|
@ -13,8 +13,8 @@ set(SRC_FILES main.cpp args.cpp application.cpp)
|
||||||
set(TEST_HEADER_FILES)
|
set(TEST_HEADER_FILES)
|
||||||
set(TEST_SRC_FILES tests/application.cpp)
|
set(TEST_SRC_FILES tests/application.cpp)
|
||||||
|
|
||||||
# use testfiles directory from connector
|
# use testfiles directory from syncthingconnector
|
||||||
set(META_SRCDIR_REFS "${CMAKE_CURRENT_SOURCE_DIR}\n${CMAKE_CURRENT_SOURCE_DIR}/../connector")
|
set(META_SRCDIR_REFS "${CMAKE_CURRENT_SOURCE_DIR}\n${CMAKE_CURRENT_SOURCE_DIR}/../syncthingconnector")
|
||||||
|
|
||||||
# find c++utilities
|
# find c++utilities
|
||||||
find_package(${PACKAGE_NAMESPACE_PREFIX}c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.21.0 REQUIRED)
|
find_package(${PACKAGE_NAMESPACE_PREFIX}c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.21.0 REQUIRED)
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
../libsyncthing
|
|
|
@ -1 +0,0 @@
|
||||||
../connector
|
|
|
@ -1 +0,0 @@
|
||||||
../model
|
|
|
@ -1 +0,0 @@
|
||||||
../widgets
|
|
|
@ -1,6 +1,5 @@
|
||||||
#include "./syncthingprocess.h"
|
#include "./syncthingprocess.h"
|
||||||
|
#include "./syncthingconnection.h"
|
||||||
#include <syncthingconnector/syncthingconnection.h>
|
|
||||||
|
|
||||||
#include <QEventLoop>
|
#include <QEventLoop>
|
||||||
#include <QStringBuilder>
|
#include <QStringBuilder>
|
Before Width: | Height: | Size: 635 B After Width: | Height: | Size: 635 B |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue