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

Merge PR #616: CMake: change output directory from "bin" to "build"

.gitignore

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

.travis.yml

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

CMakeLists.txt

@@ -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")
 endif()
 
+set(BUILD_DIRECTORY ${SoftEtherVPN_SOURCE_DIR}/build)
+
 add_subdirectory(src)
 
 # Packaging
 set(CPACK_GENERATOR "DEB")
 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_VENDOR "SoftEther")
 set(CPACK_PACKAGE_NAME "softether")

src/vpnbridge/CMakeLists.txt

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

src/vpnclient/CMakeLists.txt

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

src/vpncmd/CMakeLists.txt

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

src/vpnserver/CMakeLists.txt

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