AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-11-25 10:59:53 +03:00
Code Releases Activity

CMake: Link Cedar to Mayaqua directly

Browse Source 
It's Cedar itself that depends on Mayaqua, not the executables.
This commit is contained in:
Davide Beatrici 2021-07-07 08:08:12 +02:00
parent 4eae5820f6
commit 4328e6e5ab
10 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Cedar/CMakeLists.txt
View File

@ -19,6 +19,8 @@ set_target_properties(cedar
RUNTIME_OUTPUT_DIRECTORY "${BUILD_DIRECTORY}" RUNTIME_OUTPUT_DIRECTORY "${BUILD_DIRECTORY}"
) )
target_link_libraries(cedar PUBLIC mayaqua)
cmake_host_system_information(RESULT HAS_SSE2 QUERY HAS_SSE2) cmake_host_system_information(RESULT HAS_SSE2 QUERY HAS_SSE2)
set(BLAKE2_SRC_PATH $<IF:$<BOOL:${HAS_SSE2}>,${TOP_DIRECTORY}/3rdparty/BLAKE2/sse,${TOP_DIRECTORY}/3rdparty/BLAKE2/ref>) set(BLAKE2_SRC_PATH $<IF:$<BOOL:${HAS_SSE2}>,${TOP_DIRECTORY}/3rdparty/BLAKE2/sse,${TOP_DIRECTORY}/3rdparty/BLAKE2/ref>)

2
src/PenCore/CMakeLists.txt
View File

@ -12,4 +12,4 @@ set_target_properties(PenCore
PDB_OUTPUT_DIRECTORY "${BUILD_DIRECTORY}" PDB_OUTPUT_DIRECTORY "${BUILD_DIRECTORY}"
) )
target_link_libraries(PenCore cedar mayaqua) target_link_libraries(PenCore)

2
src/vpnbridge/CMakeLists.txt
View File

@ -29,7 +29,7 @@ set_target_properties(vpnbridge
RUNTIME_OUTPUT_DIRECTORY "${BUILD_DIRECTORY}" RUNTIME_OUTPUT_DIRECTORY "${BUILD_DIRECTORY}"
) )
target_link_libraries(vpnbridge cedar mayaqua) target_link_libraries(vpnbridge cedar)
if(UNIX) if(UNIX)
# Copy binary and "hamcore.se2" to /usr/lib(exec)/softether/, install launch script and systemd service # Copy binary and "hamcore.se2" to /usr/lib(exec)/softether/, install launch script and systemd service

2
src/vpnclient/CMakeLists.txt
View File

@ -29,7 +29,7 @@ set_target_properties(vpnclient
RUNTIME_OUTPUT_DIRECTORY "${BUILD_DIRECTORY}" RUNTIME_OUTPUT_DIRECTORY "${BUILD_DIRECTORY}"
) )
target_link_libraries(vpnclient cedar mayaqua) target_link_libraries(vpnclient cedar)
if(UNIX) if(UNIX)
# Copy binary and "hamcore.se2" to /usr/lib(exec)/softether/, install launch script and systemd service # Copy binary and "hamcore.se2" to /usr/lib(exec)/softether/, install launch script and systemd service

2
src/vpncmd/CMakeLists.txt
View File

@ -29,7 +29,7 @@ if(WIN32)
) )
endif() endif()
target_link_libraries(vpncmd cedar mayaqua) target_link_libraries(vpncmd cedar)
if(UNIX) if(UNIX)
# Copy binary and "hamcore.se2" to /usr/lib(exec)/softether/, install launch script # Copy binary and "hamcore.se2" to /usr/lib(exec)/softether/, install launch script

2
src/vpncmgr/CMakeLists.txt
View File

@ -26,4 +26,4 @@ set_target_properties(vpncmgr
PDB_OUTPUT_DIRECTORY "${BUILD_DIRECTORY}" PDB_OUTPUT_DIRECTORY "${BUILD_DIRECTORY}"
) )
target_link_libraries(vpncmgr cedar mayaqua) target_link_libraries(vpncmgr cedar)

2
src/vpnserver/CMakeLists.txt
View File

@ -29,7 +29,7 @@ set_target_properties(vpnserver
RUNTIME_OUTPUT_DIRECTORY "${BUILD_DIRECTORY}" RUNTIME_OUTPUT_DIRECTORY "${BUILD_DIRECTORY}"
) )
target_link_libraries(vpnserver cedar mayaqua) target_link_libraries(vpnserver cedar)
if(UNIX) if(UNIX)
# Copy binary and "hamcore.se2" to /usr/lib(exec)/softether/, install launch script and systemd service # Copy binary and "hamcore.se2" to /usr/lib(exec)/softether/, install launch script and systemd service

2
src/vpnsetup/CMakeLists.txt
View File

@ -26,4 +26,4 @@ set_target_properties(vpnsetup
PDB_OUTPUT_DIRECTORY "${BUILD_DIRECTORY}" PDB_OUTPUT_DIRECTORY "${BUILD_DIRECTORY}"
) )
target_link_libraries(vpnsetup cedar mayaqua) target_link_libraries(vpnsetup cedar)

2
src/vpnsmgr/CMakeLists.txt
View File

@ -26,4 +26,4 @@ set_target_properties(vpnsmgr
PDB_OUTPUT_DIRECTORY "${BUILD_DIRECTORY}" PDB_OUTPUT_DIRECTORY "${BUILD_DIRECTORY}"
) )
target_link_libraries(vpnsmgr cedar mayaqua) target_link_libraries(vpnsmgr cedar)

2
src/vpntest/CMakeLists.txt
View File

@ -29,4 +29,4 @@ if(WIN32)
) )
endif() endif()
target_link_libraries(vpntest cedar mayaqua) target_link_libraries(vpntest cedar)