From f990e3f91895a151beadecf2e089c490b766fb07 Mon Sep 17 00:00:00 2001 From: "nissim.hadar" Date: Fri, 17 Nov 2017 05:10:14 -0800 Subject: [PATCH] Build auto-tester iff ITK has been installed. --- BUILD_WIN.md | 16 +++++++++++++--- tools/CMakeLists.txt | 3 +++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/BUILD_WIN.md b/BUILD_WIN.md index eea1f85e5b..ec101d8121 100644 --- a/BUILD_WIN.md +++ b/BUILD_WIN.md @@ -40,7 +40,17 @@ Go to `Control Panel > System > Advanced System Settings > Environment Variables * In the vcpkg directory, install the 64 bit OpenSSL package with the command `vcpkg install openssl:x64-windows` * Once the build completes you should have a file `ssl.h` in `${VCPKG_ROOT}/installed/x64-windows/include/openssl` -### Step 7. Running CMake to Generate Build Files +### Step 7. Installing ITK from GitHub (only required for automatic testing) + + * Clone ITK from + * Build ITK + * cd to ITK root + * mkdir build + * cd build + * cmake -G "Visual Studio 15 Win64" + * open ITK.sln and build ITK + * create environment variable ITK_DIR=`the ITK build directory just created` +### Step 8. Running CMake to Generate Build Files Run Command Prompt from Start and run the following commands: ``` @@ -52,7 +62,7 @@ cmake .. -G "Visual Studio 15 Win64" Where `%HIFI_DIR%` is the directory for the highfidelity repository. -### Step 8. Making a Build +### Step 9. Making a Build Open `%HIFI_DIR%\build\hifi.sln` using Visual Studio. @@ -60,7 +70,7 @@ Change the Solution Configuration (next to the green play button) from "Debug" t Run `Build > Build Solution`. -### Step 9. Testing Interface +### Step 10. Testing Interface Create another environment variable (see Step #4) * Set "Variable name": `_NO_DEBUG_HEAP` diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index ba795480be..e7d5018ef7 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -23,7 +23,10 @@ if (BUILD_TOOLS) add_subdirectory(oven) set_target_properties(oven PROPERTIES FOLDER "Tools") +endif() +if (DEFINED ENV{ITK_DIR}) add_subdirectory(auto-tester) set_target_properties(auto-tester PROPERTIES FOLDER "Tools") endif() +