rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove ../ includes in src/lib

This commit is contained in:
Andrew Nelless 2017-03-09 14:32:41 +00:00
parent 0cd45ba1ef
commit fedbcb0f3a
33 changed files with 15 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -50,7 +50,6 @@ if (COMMAND cmake_policy)
cmake_policy (SET CMP0005 NEW)
endif()
# Add headers to source list
if (${CMAKE_GENERATOR} STREQUAL "Unix Makefiles")
set (SYNERGY_ADD_HEADERS FALSE)
@ -58,8 +57,8 @@ else()
set (SYNERGY_ADD_HEADERS TRUE)
endif()
set (libs)
include_directories (BEFORE SYSTEM ./ext/gtest/include)
if (UNIX)
if (NOT APPLE)
@ -291,34 +290,31 @@ endif()
#
if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
set (OPENSSL_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/ext/openssl/windows)
if (CMAKE_SIZEOF_VOID_P EQUAL 8)
set (OPENSSL_ROOT "${OPENSSL_ROOT}/x64")
else()
set (OPENSSL_ROOT "${OPENSSL_ROOT}/x86")
endif()
include_directories (BEFORE SYSTEM ${OPENSSL_ROOT}/include)
set (OPENSSL_LIBS
${OPENSSL_ROOT}/lib/libeay32.lib
${OPENSSL_ROOT}/lib/ssleay32.lib
)
elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set (OPENSSL_ROOT /usr/local/opt/openssl)
include_directories (BEFORE SYSTEM ${OPENSSL_ROOT}/include)
set (OPENSSL_LIBS
${OPENSSL_ROOT}/lib/libssl.a
${OPENSSL_ROOT}/lib/libcrypto.a
)
elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
set (OPENSSL_LIBS ssl crypto)
else()
message (FATAL_ERROR "Couldn't find OpenSSL")
endif()
set (OPENSSL_INCLUDE ${OPENSSL_ROOT}/include)
#
# Configure_file... but for directories, recursively.
#

1
src/CMakeLists.txt
View File

@ -14,6 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
include_directories (./lib)
include_directories (${CMAKE_CURRENT_BINARY_DIR}/lib)
add_subdirectory(lib)

2
src/cmd/CMakeLists.txt
View File

@ -19,6 +19,6 @@ add_subdirectory(synergys)
add_subdirectory(syntool)
if (SYNERGY_BUILD_LEGACY_SERVICE)
add_subdirectory(synergyd)
add_subdirectory(synergyd)
endif (SYNERGY_BUILD_LEGACY_SERVICE)

4
src/cmd/synergyc/CMakeLists.txt
View File

@ -45,10 +45,6 @@ if (SYNERGY_ADD_HEADERS)
list(APPEND sources ${headers})
endif()
include_directories(
../../lib/
)
add_executable(synergyc ${sources})
target_link_libraries(synergyc
arch base client common io mt net ipc platform server synlib ${libs} ${OPENSSL_LIBS})

4
src/cmd/synergyd/CMakeLists.txt
View File

@ -17,10 +17,6 @@
file(GLOB headers "*.h")
file(GLOB sources "*.cpp")
include_directories(
../../lib/
)
if (WIN32)
add_executable (synergyd WIN32 ${sources})
else()

4
src/cmd/synergys/CMakeLists.txt
View File

@ -45,10 +45,6 @@ if (SYNERGY_ADD_HEADERS)
list(APPEND sources ${headers})
endif()
include_directories(
../../lib/
)
add_executable(synergys ${sources})
target_link_libraries(synergys
arch base client common io mt net ipc platform server synlib ${libs} ${OPENSSL_LIBS})

4
src/cmd/syntool/CMakeLists.txt
View File

@ -16,10 +16,6 @@
file(GLOB headers "*.h")
file(GLOB sources "*.cpp")
include_directories(
../../lib/
)
add_executable(syntool ${sources})
target_link_libraries(syntool
synlib arch base client common io ipc mt net platform server ${libs} ${OPENSSL_LIBS})

6
src/gui/CMakeLists.txt
View File

@ -10,7 +10,7 @@ file (GLOB LEGACY_GUI_SOURCE_FILES src/*.cpp src/*.h)
file (GLOB LEGACY_GUI_UI_FILES src/*.ui)
if (WIN32)
set (LEGACY_GUI_RC_FILES res/win/Synergy.rc)
set (LEGACY_GUI_RC_FILES res/win/Synergy.rc)
endif()
add_executable (synergy WIN32
@ -20,7 +20,7 @@ add_executable (synergy WIN32
res/Synergy.qrc
)
include_directories (../lib/shared ./src)
include_directories (./src)
target_link_libraries (synergy shared)
if (WIN32)
@ -37,7 +37,7 @@ target_compile_definitions (synergy PRIVATE -DVERSION_STAGE="${VERSION_STAGE}")
target_compile_definitions (synergy PRIVATE -DVERSION_REVISION="${SYNERGY_GIT_COMMIT}")
if (WIN32)
target_link_libraries (synergy ${DNSSD_LIB})
target_link_libraries (synergy ${DNSSD_LIB})
set_target_properties (synergy PROPERTIES LINK_FLAGS "/NODEFAULTLIB:LIBCMT")
endif()

2
src/gui/src/ActivationDialog.cpp
View File

@ -3,7 +3,7 @@
#include "CancelActivationDialog.h"
#include "AppConfig.h"
#include "WebClient.h"
#include "EditionType.h"
#include <shared/EditionType.h>
#include "ActivationNotifier.h"
#include "MainWindow.h"
#include "QUtility.h"

1
src/gui/src/AppConfig.cpp
View File

@ -17,7 +17,6 @@
*/
#include "AppConfig.h"
#include "EditionType.h"
#include "QUtility.h"
#include <QtCore>

2
src/gui/src/AppConfig.h
View File

@ -23,7 +23,7 @@
#include <QObject>
#include <QString>
#include "ElevateMode.h"
#include <EditionType.h>
#include <shared/EditionType.h>
// this should be incremented each time a new page is added. this is
// saved to settings when the user finishes running the wizard. if

1
src/gui/src/LicenseManager.cpp
View File

@ -16,7 +16,6 @@
*/
#include "LicenseManager.h"
#include "EditionType.h"
#include "AppConfig.h"
#include <ctime>
#include <stdexcept>

3
src/gui/src/LicenseManager.h
View File

@ -18,7 +18,8 @@
#pragma once
#include <QObject>
#include <SerialKey.h>
#include <shared/EditionType.h>
#include <shared/SerialKey.h>
#include <ActivationNotifier.h>
#include <utility>

2
src/gui/src/MainWindow.cpp
View File

@ -31,7 +31,7 @@
#include "DataDownloader.h"
#include "CommandProcess.h"
#include "LicenseManager.h"
#include "EditionType.h"
#include <shared/EditionType.h>
#include "QUtility.h"
#include "ProcessorArch.h"
#include "SslCertificate.h"

1
src/gui/src/QUtility.cpp
View File

@ -19,7 +19,6 @@
#include "ProcessorArch.h"
#include "CommandProcess.h"
#include "EditionType.h"
#if defined(Q_OS_LINUX)
#include <QProcess>

1
src/gui/src/SettingsDialog.cpp
View File

@ -23,7 +23,6 @@
#include "QSynergyApplication.h"
#include "QUtility.h"
#include "AppConfig.h"
#include "EditionType.h"
#include "SslCertificate.h"
#include "MainWindow.h"

1
src/gui/src/SetupWizard.cpp
View File

@ -20,7 +20,6 @@
#include "WebClient.h"
#include "ActivationNotifier.h"
#include "LicenseManager.h"
#include "EditionType.h"
#include "QSynergyApplication.h"
#include "QUtility.h"

1
src/gui/src/WebClient.cpp
View File

@ -17,7 +17,6 @@
#include "WebClient.h"
#include "EditionType.h"
#include "QUtility.h"
#include <QProcess>

4
src/lib/arch/CMakeLists.txt
View File

@ -37,10 +37,6 @@ if (SYNERGY_ADD_HEADERS)
list(APPEND sources ${headers})
endif()
include_directories(
../
)
add_library(arch STATIC ${sources})
if (UNIX)

4
src/lib/base/CMakeLists.txt
View File

@ -21,10 +21,6 @@ if (SYNERGY_ADD_HEADERS)
list(APPEND sources ${headers})
endif()
include_directories(
../
)
add_library(base STATIC ${sources})
if (UNIX)

5
src/lib/client/CMakeLists.txt
View File

@ -21,11 +21,6 @@ if (SYNERGY_ADD_HEADERS)
list(APPEND sources ${headers})
endif()
include_directories(
../
../../../ext
)
add_library(client STATIC ${sources})
if (UNIX)

4
src/lib/common/CMakeLists.txt
View File

@ -21,8 +21,4 @@ if (SYNERGY_ADD_HEADERS)
list(APPEND sources ${headers})
endif()
include_directories(
../
)
add_library(common STATIC ${sources})

4
src/lib/io/CMakeLists.txt
View File

@ -21,8 +21,4 @@ if (SYNERGY_ADD_HEADERS)
list(APPEND sources ${headers})
endif()
include_directories(
../
)
add_library(io STATIC ${sources})

4
src/lib/ipc/CMakeLists.txt
View File

@ -21,10 +21,6 @@ if (SYNERGY_ADD_HEADERS)
list(APPEND sources ${headers})
endif()
include_directories(
../
)
add_library(ipc STATIC ${sources})
if (UNIX)

4
src/lib/mt/CMakeLists.txt
View File

@ -21,8 +21,4 @@ if (SYNERGY_ADD_HEADERS)
list(APPEND sources ${headers})
endif()
include_directories(
../
)
add_library(mt STATIC ${sources})

5
src/lib/net/CMakeLists.txt
View File

@ -21,11 +21,6 @@ if (SYNERGY_ADD_HEADERS)
list(APPEND sources ${headers})
endif()
include_directories(
../
${OPENSSL_INCLUDE}
)
add_library(net STATIC ${sources})
if (UNIX)

5
src/lib/platform/CMakeLists.txt
View File

@ -29,11 +29,6 @@ if (SYNERGY_ADD_HEADERS)
list(APPEND sources ${headers})
endif()
include_directories(
../
../../../ext/gtest/include
)
if (APPLE)
list(APPEND inc
/System/Library/Frameworks

6
src/lib/server/CMakeLists.txt
View File

@ -21,12 +21,6 @@ if (SYNERGY_ADD_HEADERS)
list(APPEND sources ${headers})
endif()
include_directories(
../
../../../ext
../../../ext/gtest/include
)
add_library(server STATIC ${sources})
target_link_libraries(server shared)

6
src/lib/shared/CMakeLists.txt
View File

@ -22,11 +22,5 @@ endif()
add_library(shared STATIC ${sources})
include_directories(
../
../../../ext
../../../ext/gtest/include
)
target_link_libraries(shared arch base)

2
src/lib/shared/SerialKey.h
View File

@ -22,7 +22,7 @@
#include "EditionType.h"
#ifdef TEST_ENV
#include "gtest/gtest_prod.h"
#include <gtest/gtest_prod.h>
#endif
class SerialKey {

6
src/lib/synergy/CMakeLists.txt
View File

@ -33,12 +33,6 @@ if (SYNERGY_ADD_HEADERS)
list(APPEND sources ${headers})
endif()
include_directories(
../
../../../ext
../../../ext/gtest/include
)
add_library(synlib STATIC ${sources})
if (UNIX)

2
src/lib/synergy/KeyMap.h
View File

@ -24,7 +24,7 @@
#include "common/stdset.h"
#include "common/stdvector.h"
#include "gtest/gtest_prod.h"
#include <gtest/gtest_prod.h>
namespace synergy {

4
src/lib/synwinhk/CMakeLists.txt
View File

@ -20,10 +20,6 @@ if (SYNERGY_ADD_HEADERS)
list(APPEND sources ${headers})
endif()
include_directories(
../
)
add_library(synwinhk SHARED ${sources})
if (NOT MSVC_VERSION VERSION_LESS 1900)