Support CMake SDK (#178)

* Updated scripts and setup instructions for SDK build now that it is cmake
keystone-enclave · May 13, 2020 · e6c7ec1 · e6c7ec1
1 parent 6d4c2fa
commit e6c7ec1
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 4 deletions.
diff --git a/docs/source/Getting-Started/QEMU-Setup-Repository.rst b/docs/source/Getting-Started/QEMU-Setup-Repository.rst
@@ -66,7 +66,12 @@ Install the Keystone SDK and prepare Eyrie runtime source code.
 
 ::
 
-  make -C sdk
+   cd sdk
+   mkdir build
+   cd build
+   cmake .. -DOUTPUT_DIR=$(pwd)/../lib
+   make
+   make install
 
 Initialize the runtime (i.e., Eyrie) source code.
 

diff --git a/fast-setup.sh b/fast-setup.sh
@@ -58,7 +58,13 @@ git submodule update --init --recursive
 
 # build tests in SDK
 export KEYSTONE_SDK_DIR=$(pwd)/sdk
-make -C sdk
+cd sdk
+mkdir build
+cd build
+cmake .. -DOUTPUT_DIR=$(pwd)/../lib
+make
+make install
+cd ../..
 ./sdk/scripts/init.sh --runtime eyrie --force
 
 echo "Keystone is fully setup! You can build everything and run the tests with 'make run-tests'"
diff --git a/sdk b/sdk
diff --git a/setup.sh b/setup.sh
@@ -12,6 +12,12 @@ make && make linux
 cd ..
 
 # build tests in SDK
-make -C sdk
 export KEYSTONE_SDK_DIR=$(pwd)/sdk
+cd sdk
+mkdir build
+cd build
+cmake .. -DOUTPUT_DIR=$(pwd)/../lib
+make
+make install
+cd ../..
 ./sdk/scripts/init.sh --runtime eyrie --force