Browse Source

Move binaries in bin folder

Jonas Pflanzer 4 years ago
parent
commit
1fc6794af4

+ 2 - 0
cli/src/CMakeLists.txt

@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 2.8)
 
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+
 find_package(Readline REQUIRED)
 
 include_directories(${Boost_INCLUDE_DIR} ${JSONCPP_INCLUDE_DIRS} ${Readline_INCLUDE_DIR} include)

+ 2 - 2
cli/test/cryptoget.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_PATH=${0%/*}
-if [ "$0" != "$SCRIPT_PATH" ] && [ "$SCRIPT_PATH" != "" ]; then 
+if [ "$0" != "$SCRIPT_PATH" ] && [ "$SCRIPT_PATH" != "" ]; then
     cd "$SCRIPT_PATH/.."
 fi
 
@@ -16,7 +16,7 @@ echo "using file path $DAEMONFILEPATH"
 
 test/cryptotest_gcm 1 test/samplekey1.bin test/samplefile.txt $DAEMONFILEPATH/samplefile.txt
 
-./ccats-cli --batch test/cryptoget.txt
+bin/ccats-cli --batch test/cryptoget.txt
 
 if [ ! -f test/cryptoget.txt.out ];
 then

+ 2 - 2
cli/test/cryptoput.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_PATH=${0%/*}
-if [ "$0" != "$SCRIPT_PATH" ] && [ "$SCRIPT_PATH" != "" ]; then 
+if [ "$0" != "$SCRIPT_PATH" ] && [ "$SCRIPT_PATH" != "" ]; then
     cd "$SCRIPT_PATH/.."
 fi
 
@@ -15,7 +15,7 @@ fi
 echo "am in directory $PWD"
 echo "using file path $DAEMONFILEPATH"
 
-./ccats-cli --batch test/cryptoput.txt
+bin/ccats-cli --batch test/cryptoput.txt
 
 if [ ! -f test/cryptoput.txt.out ];
 then

+ 2 - 2
cli/test/logintest_neg.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_PATH=${0%/*}
-if [ "$0" != "$SCRIPT_PATH" ] && [ "$SCRIPT_PATH" != "" ]; then 
+if [ "$0" != "$SCRIPT_PATH" ] && [ "$SCRIPT_PATH" != "" ]; then
     cd "$SCRIPT_PATH/.."
 fi
 
@@ -9,7 +9,7 @@ if [ $# -eq 1 ];
 	then DAEMONFILEPATH="$1"
 fi
 
-./ccats-cli --batch test/logintest_neg.txt
+bin/ccats-cli --batch test/logintest_neg.txt
 
 if [ ! -f test/logintest_neg.txt.err ];
 then

+ 2 - 2
cli/test/logintest_pos.sh

@@ -1,11 +1,11 @@
 #!/bin/bash
 
 SCRIPT_PATH=${0%/*}
-if [ "$0" != "$SCRIPT_PATH" ] && [ "$SCRIPT_PATH" != "" ]; then 
+if [ "$0" != "$SCRIPT_PATH" ] && [ "$SCRIPT_PATH" != "" ]; then
     cd "$SCRIPT_PATH/.."
 fi
 
-./ccats-cli --batch test/logintest_pos.txt
+bin/ccats-cli --batch test/logintest_pos.txt
 
 if [ ! -f test/logintest_pos.txt.out ];
 then

+ 1 - 0
gui/CMakeLists.txt

@@ -7,6 +7,7 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 
 find_package(Threads)
 find_package(Qt5 COMPONENTS Core Quick Widgets REQUIRED)