mirror of
https://github.com/SoftEtherVPN/SoftEtherVPN.git
synced 2026-10-22 01:51:20 +03:00
CMake: don't hardcode build directories
Our CMake project used to forcefully create and use two different build directories: "build" and "tmp". This commit changes the behavior so that only the build directory CMake is ran in is used. The "configure" script now runs CMake in "build" by default, instead of "tmp".
This commit is contained in:
1 parent
7b042e53d2
commit
369a8850c4
11 files changed
+22
-36
No files matched your search
@@ -17,8 +17,8 @@ echo
|
||||
echo 'Welcome to the corner-cutting configure script !'
|
||||
echo
|
||||
|
||||
if [ ! -d "tmp" ]; then
|
||||
mkdir tmp
|
||||
if [ ! -d "build" ]; then
|
||||
mkdir build
|
||||
fi
|
||||
|
||||
if [ ! -z ${CMAKE_FLAGS+x} ]; then
|
||||
@@ -50,9 +50,9 @@ fi
|
||||
|
||||
echo ""
|
||||
|
||||
(cd tmp && cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo ${CMAKE_FLAGS} .. || exit 1)
|
||||
(cd build && cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo ${CMAKE_FLAGS} .. || exit 1)
|
||||
|
||||
|
||||
echo ""
|
||||
|
||||
echo "The Makefile is generated. Run 'make -C tmp' to build SoftEther VPN."
|
||||
echo "The Makefile is generated. Run 'make -C build' to build SoftEther VPN."
|
||||
Reference in new issue
Block a user