1
0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-11-23 01:49:53 +03:00

Merge pull request #616 from davidebeatrici/cmake-build-directory

Merge PR #616: CMake: change output directory from "bin" to "build"
This commit is contained in:
Ilya Shipitsin 2018-08-12 23:30:40 +05:00 committed by GitHub
commit b7c961167a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 18 additions and 15 deletions

1
.gitignore vendored
View File

@ -3,6 +3,7 @@
.settings/ .settings/
Makefile Makefile
bin/ bin/
build/
cmake-build-debug/ cmake-build-debug/
src/bin/BuiltHamcoreFiles/ src/bin/BuiltHamcoreFiles/
tmp/ tmp/

View File

@ -33,7 +33,7 @@ matrix:
script: script:
- ./configure - ./configure
- make -C tmp - make -C tmp
- otool -L bin/vpnserver/vpnserver - otool -L build/vpnserver/vpnserver
addons: addons:
apt: apt:
@ -57,5 +57,5 @@ script:
- export LDFLAGS="-L${HOME}/opt/lib" - export LDFLAGS="-L${HOME}/opt/lib"
- ./configure - ./configure
- make -C tmp - make -C tmp
- ldd bin/vpnserver/vpnserver - ldd build/vpnserver/vpnserver
- if [ "${BUILD_DEB}" = "1" ]; then make package -C tmp; fi - if [ "${BUILD_DEB}" = "1" ]; then make package -C tmp; fi

View File

@ -12,12 +12,14 @@ if(EXISTS "${SoftEtherVPN_SOURCE_DIR}/.git" AND NOT EXISTS "${SoftEtherVPN_SOURC
message (FATAL_ERROR "Submodules are not initialized. Run\n\tgit submodule update --init --recursive") message (FATAL_ERROR "Submodules are not initialized. Run\n\tgit submodule update --init --recursive")
endif() endif()
set(BUILD_DIRECTORY ${SoftEtherVPN_SOURCE_DIR}/build)
add_subdirectory(src) add_subdirectory(src)
# Packaging # Packaging
set(CPACK_GENERATOR "DEB") set(CPACK_GENERATOR "DEB")
set(CPACK_COMPONENTS_ALL vpnserver vpnclient vpnbridge vpncmd) set(CPACK_COMPONENTS_ALL vpnserver vpnclient vpnbridge vpncmd)
set(CPACK_PACKAGE_DIRECTORY ${SoftEtherVPN_SOURCE_DIR}/bin) set(CPACK_PACKAGE_DIRECTORY ${BUILD_DIRECTORY})
set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION}) set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
set(CPACK_PACKAGE_VENDOR "SoftEther") set(CPACK_PACKAGE_VENDOR "SoftEther")
set(CPACK_PACKAGE_NAME "softether") set(CPACK_PACKAGE_NAME "softether")

View File

@ -2,9 +2,9 @@ add_executable(vpnbridge vpnbridge.c)
set_target_properties(vpnbridge set_target_properties(vpnbridge
PROPERTIES PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/tmp/vpnbridge" ARCHIVE_OUTPUT_DIRECTORY "${BUILD_DIRECTORY}/vpnbridge"
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/bin/vpnbridge" LIBRARY_OUTPUT_DIRECTORY "${BUILD_DIRECTORY}/vpnbridge"
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/bin/vpnbridge" RUNTIME_OUTPUT_DIRECTORY "${BUILD_DIRECTORY}/vpnbridge"
) )
target_link_libraries(vpnbridge cedar mayaqua) target_link_libraries(vpnbridge cedar mayaqua)

View File

@ -2,9 +2,9 @@ add_executable(vpnclient vpncsvc.c)
set_target_properties(vpnclient set_target_properties(vpnclient
PROPERTIES PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/tmp/vpnclient" ARCHIVE_OUTPUT_DIRECTORY "${BUILD_DIRECTORY}/vpnclient"
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/bin/vpnclient" LIBRARY_OUTPUT_DIRECTORY "${BUILD_DIRECTORY}/vpnclient"
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/bin/vpnclient" RUNTIME_OUTPUT_DIRECTORY "${BUILD_DIRECTORY}/vpnclient"
) )
target_link_libraries(vpnclient cedar mayaqua) target_link_libraries(vpnclient cedar mayaqua)

View File

@ -2,9 +2,9 @@ add_executable(vpncmd vpncmd.c)
set_target_properties(vpncmd set_target_properties(vpncmd
PROPERTIES PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/tmp/vpncmd" ARCHIVE_OUTPUT_DIRECTORY "${BUILD_DIRECTORY}/vpncmd"
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/bin/vpncmd" LIBRARY_OUTPUT_DIRECTORY "${BUILD_DIRECTORY}/vpncmd"
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/bin/vpncmd" RUNTIME_OUTPUT_DIRECTORY "${BUILD_DIRECTORY}/vpncmd"
) )
target_link_libraries(vpncmd cedar mayaqua) target_link_libraries(vpncmd cedar mayaqua)

View File

@ -2,9 +2,9 @@ add_executable(vpnserver vpnserver.c)
set_target_properties(vpnserver set_target_properties(vpnserver
PROPERTIES PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/tmp/vpnserver" ARCHIVE_OUTPUT_DIRECTORY "${BUILD_DIRECTORY}/vpnserver"
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/bin/vpnserver" LIBRARY_OUTPUT_DIRECTORY "${BUILD_DIRECTORY}/vpnserver"
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/bin/vpnserver" RUNTIME_OUTPUT_DIRECTORY "${BUILD_DIRECTORY}/vpnserver"
) )
target_link_libraries(vpnserver cedar mayaqua) target_link_libraries(vpnserver cedar mayaqua)