From 06253c965b3d1dd86f50234d080c12d9722bff87 Mon Sep 17 00:00:00 2001 From: XinyuHou Date: Tue, 20 Jan 2015 16:18:51 +0000 Subject: [PATCH] resolve #4328 by moving plugin into lib folder --- src/CMakeLists.txt | 1 - src/lib/CMakeLists.txt | 2 ++ src/{ => lib}/plugin/CMakeLists.txt | 0 src/{ => lib}/plugin/ns/CMakeLists.txt | 18 +++++++++--------- src/{ => lib}/plugin/ns/SecureListenSocket.cpp | 0 src/{ => lib}/plugin/ns/SecureListenSocket.h | 0 src/{ => lib}/plugin/ns/SecureSocket.cpp | 0 src/{ => lib}/plugin/ns/SecureSocket.h | 0 src/{ => lib}/plugin/ns/ns.cpp | 0 src/{ => lib}/plugin/ns/ns.h | 0 src/{ => lib}/plugin/winmmjoy/CMakeLists.txt | 4 ++-- src/{ => lib}/plugin/winmmjoy/winmmjoy.cpp | 0 src/{ => lib}/plugin/winmmjoy/winmmjoy.h | 0 13 files changed, 13 insertions(+), 12 deletions(-) rename src/{ => lib}/plugin/CMakeLists.txt (100%) rename src/{ => lib}/plugin/ns/CMakeLists.txt (83%) rename src/{ => lib}/plugin/ns/SecureListenSocket.cpp (100%) rename src/{ => lib}/plugin/ns/SecureListenSocket.h (100%) rename src/{ => lib}/plugin/ns/SecureSocket.cpp (100%) rename src/{ => lib}/plugin/ns/SecureSocket.h (100%) rename src/{ => lib}/plugin/ns/ns.cpp (100%) rename src/{ => lib}/plugin/ns/ns.h (100%) rename src/{ => lib}/plugin/winmmjoy/CMakeLists.txt (88%) rename src/{ => lib}/plugin/winmmjoy/winmmjoy.cpp (100%) rename src/{ => lib}/plugin/winmmjoy/winmmjoy.h (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0dec87f2..0adee82f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -16,7 +16,6 @@ add_subdirectory(lib) add_subdirectory(cmd) -add_subdirectory(plugin) add_subdirectory(micro) if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "IRIX") diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt index 6cbbcf45..2990d16d 100644 --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt @@ -23,9 +23,11 @@ add_subdirectory(ipc) add_subdirectory(mt) add_subdirectory(net) add_subdirectory(platform) +add_subdirectory(plugin) add_subdirectory(server) add_subdirectory(synergy) + if (WIN32) add_subdirectory(synwinhk) endif() diff --git a/src/plugin/CMakeLists.txt b/src/lib/plugin/CMakeLists.txt similarity index 100% rename from src/plugin/CMakeLists.txt rename to src/lib/plugin/CMakeLists.txt diff --git a/src/plugin/ns/CMakeLists.txt b/src/lib/plugin/ns/CMakeLists.txt similarity index 83% rename from src/plugin/ns/CMakeLists.txt rename to src/lib/plugin/ns/CMakeLists.txt index b8396bc7..0db61b60 100644 --- a/src/plugin/ns/CMakeLists.txt +++ b/src/lib/plugin/ns/CMakeLists.txt @@ -21,16 +21,16 @@ if (SYNERGY_ADD_HEADERS) endif() if (WIN32) - set(OPENSSL_INCLUDE ../../../ext/openssl/inc32) + set(OPENSSL_INCLUDE ../../../../ext/openssl/inc32) endif() if (APPLE) - set(OPENSSL_INCLUDE ../../../ext/openssl/include) + set(OPENSSL_INCLUDE ../../../../ext/openssl/include) endif() include_directories( - ../../lib/ - ../../.. + ../../../lib/ + ../../../.. ${OPENSSL_INCLUDE} ) @@ -62,8 +62,8 @@ if (WIN32) TARGET ns POST_BUILD COMMAND xcopy /Y /Q - ..\\..\\..\\..\\lib\\${CMAKE_CFG_INTDIR}\\ns.dll - ..\\..\\..\\..\\bin\\${CMAKE_CFG_INTDIR}\\plugins\\ + ..\\..\\..\\..\\..\\lib\\${CMAKE_CFG_INTDIR}\\ns.dll + ..\\..\\..\\..\\..\\bin\\${CMAKE_CFG_INTDIR}\\plugins\\ ) else() if (APPLE) @@ -83,11 +83,11 @@ else() TARGET ns POST_BUILD COMMAND mkdir -p - ../../../../../bin/plugins + ${CMAKE_SOURCE_DIR}/bin/plugins && cp - ../../../../../lib/libns.so - ../../../../../bin/plugins/ + ${CMAKE_SOURCE_DIR}/lib/libns.so + ${CMAKE_SOURCE_DIR}/bin/plugins/ ) endif() endif() diff --git a/src/plugin/ns/SecureListenSocket.cpp b/src/lib/plugin/ns/SecureListenSocket.cpp similarity index 100% rename from src/plugin/ns/SecureListenSocket.cpp rename to src/lib/plugin/ns/SecureListenSocket.cpp diff --git a/src/plugin/ns/SecureListenSocket.h b/src/lib/plugin/ns/SecureListenSocket.h similarity index 100% rename from src/plugin/ns/SecureListenSocket.h rename to src/lib/plugin/ns/SecureListenSocket.h diff --git a/src/plugin/ns/SecureSocket.cpp b/src/lib/plugin/ns/SecureSocket.cpp similarity index 100% rename from src/plugin/ns/SecureSocket.cpp rename to src/lib/plugin/ns/SecureSocket.cpp diff --git a/src/plugin/ns/SecureSocket.h b/src/lib/plugin/ns/SecureSocket.h similarity index 100% rename from src/plugin/ns/SecureSocket.h rename to src/lib/plugin/ns/SecureSocket.h diff --git a/src/plugin/ns/ns.cpp b/src/lib/plugin/ns/ns.cpp similarity index 100% rename from src/plugin/ns/ns.cpp rename to src/lib/plugin/ns/ns.cpp diff --git a/src/plugin/ns/ns.h b/src/lib/plugin/ns/ns.h similarity index 100% rename from src/plugin/ns/ns.h rename to src/lib/plugin/ns/ns.h diff --git a/src/plugin/winmmjoy/CMakeLists.txt b/src/lib/plugin/winmmjoy/CMakeLists.txt similarity index 88% rename from src/plugin/winmmjoy/CMakeLists.txt rename to src/lib/plugin/winmmjoy/CMakeLists.txt index 5318cac4..a0dcb997 100644 --- a/src/plugin/winmmjoy/CMakeLists.txt +++ b/src/lib/plugin/winmmjoy/CMakeLists.txt @@ -27,6 +27,6 @@ add_custom_command( TARGET winmmjoy POST_BUILD COMMAND xcopy /Y /Q - ..\\..\\..\\..\\lib\\${CMAKE_CFG_INTDIR}\\winmmjoy.* - ..\\..\\..\\..\\bin\\${CMAKE_CFG_INTDIR}\\plugins\\ + ..\\..\\..\\..\\..\\lib\\${CMAKE_CFG_INTDIR}\\winmmjoy.* + ..\\..\\..\\..\\..\\bin\\${CMAKE_CFG_INTDIR}\\plugins\\ ) diff --git a/src/plugin/winmmjoy/winmmjoy.cpp b/src/lib/plugin/winmmjoy/winmmjoy.cpp similarity index 100% rename from src/plugin/winmmjoy/winmmjoy.cpp rename to src/lib/plugin/winmmjoy/winmmjoy.cpp diff --git a/src/plugin/winmmjoy/winmmjoy.h b/src/lib/plugin/winmmjoy/winmmjoy.h similarity index 100% rename from src/plugin/winmmjoy/winmmjoy.h rename to src/lib/plugin/winmmjoy/winmmjoy.h