resolve #4328 by moving plugin into lib folder
This commit is contained in:
parent
a98c4bd02a
commit
06253c965b
|
@ -16,7 +16,6 @@
|
|||
|
||||
add_subdirectory(lib)
|
||||
add_subdirectory(cmd)
|
||||
add_subdirectory(plugin)
|
||||
add_subdirectory(micro)
|
||||
|
||||
if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "IRIX")
|
||||
|
|
|
@ -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()
|
||||
|
|
|
@ -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()
|
|
@ -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\\
|
||||
)
|
Loading…
Reference in New Issue