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

Changing ns plugin to use new binaries instead of older source directory. #4587

This commit is contained in:
Adam Potolsky 2015-04-28 11:55:59 -07:00
parent db631ac61d
commit e8b4017960
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/lib/plugin/ns/CMakeLists.txt
View File

@ -21,7 +21,12 @@ if (SYNERGY_ADD_HEADERS)
endif() endif()
if (WIN32) if (WIN32)
set(OPENSSL_INCLUDE ../../../../ext/openssl/inc32) if(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(OPENSSL_PLAT_DIR openssl-win64)
else()
set(OPENSSL_PLAT_DIR openssl-win32)
endif()
set(OPENSSL_INCLUDE ../../../../ext/${OPENSSL_PLAT_DIR}/inc32)
endif() endif()
if (APPLE) if (APPLE)
@ -38,8 +43,8 @@ add_library(ns SHARED ${sources})
if (WIN32) if (WIN32)
set(OPENSSL_LIBS set(OPENSSL_LIBS
${CMAKE_SOURCE_DIR}/ext/openssl/out32dll/libeay32.lib ${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/out32dll/libeay32.lib
${CMAKE_SOURCE_DIR}/ext/openssl/out32dll/ssleay32.lib ${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/out32dll/ssleay32.lib
) )
endif() endif()
@ -69,14 +74,14 @@ if (WIN32)
TARGET ns TARGET ns
POST_BUILD POST_BUILD
COMMAND xcopy /Y /Q COMMAND xcopy /Y /Q
..\\..\\..\\..\\..\\ext\\openssl\\out32dll\\libeay32.* ..\\..\\..\\..\\..\\ext\\${OPENSSL_PLAT_DIR}\\out32dll\\libeay32.*
..\\..\\..\\..\\..\\bin\\${CMAKE_CFG_INTDIR} ..\\..\\..\\..\\..\\bin\\${CMAKE_CFG_INTDIR}
) )
add_custom_command( add_custom_command(
TARGET ns TARGET ns
POST_BUILD POST_BUILD
COMMAND xcopy /Y /Q COMMAND xcopy /Y /Q
..\\..\\..\\..\\..\\ext\\openssl\\out32dll\\ssleay32.* ..\\..\\..\\..\\..\\ext\\${OPENSSL_PLAT_DIR}\\out32dll\\ssleay32.*
..\\..\\..\\..\\..\\bin\\${CMAKE_CFG_INTDIR} ..\\..\\..\\..\\..\\bin\\${CMAKE_CFG_INTDIR}
) )
else() else()