summaryrefslogtreecommitdiff
path: root/Tests/Tutorial/Step7
diff options
context:
space:
mode:
Diffstat (limited to 'Tests/Tutorial/Step7')
-rw-r--r--Tests/Tutorial/Step7/CMakeLists.txt8
-rw-r--r--Tests/Tutorial/Step7/MathFunctions/CMakeLists.txt2
-rw-r--r--Tests/Tutorial/Step7/MathFunctions/MakeTable.cxx6
-rw-r--r--Tests/Tutorial/Step7/MathFunctions/mysqrt.cxx4
-rw-r--r--Tests/Tutorial/Step7/build1.cmake8
-rw-r--r--Tests/Tutorial/Step7/build2.cmake6
6 files changed, 17 insertions, 17 deletions
diff --git a/Tests/Tutorial/Step7/CMakeLists.txt b/Tests/Tutorial/Step7/CMakeLists.txt
index 42f73f2..d9a92fb 100644
--- a/Tests/Tutorial/Step7/CMakeLists.txt
+++ b/Tests/Tutorial/Step7/CMakeLists.txt
@@ -29,7 +29,7 @@ if (USE_MYMATH)
include_directories ("${PROJECT_SOURCE_DIR}/MathFunctions")
add_subdirectory (MathFunctions)
set (EXTRA_LIBS ${EXTRA_LIBS} MathFunctions)
-endif (USE_MYMATH)
+endif ()
# add the executable
add_executable (Tutorial tutorial.cxx)
@@ -37,7 +37,7 @@ target_link_libraries (Tutorial ${EXTRA_LIBS})
# add the install targets
install (TARGETS Tutorial DESTINATION bin)
-install (FILES "${PROJECT_BINARY_DIR}/TutorialConfig.h"
+install (FILES "${PROJECT_BINARY_DIR}/TutorialConfig.h"
DESTINATION include)
# enable testing
@@ -49,7 +49,7 @@ add_test (TutorialRuns Tutorial 25)
# does the usage message work?
add_test (TutorialUsage Tutorial)
set_tests_properties (TutorialUsage
- PROPERTIES
+ PROPERTIES
PASS_REGULAR_EXPRESSION "Usage:.*number"
)
@@ -59,7 +59,7 @@ macro (do_test arg result)
set_tests_properties (TutorialComp${arg}
PROPERTIES PASS_REGULAR_EXPRESSION ${result}
)
-endmacro (do_test)
+endmacro ()
# do a bunch of result based tests
do_test (4 "4 is 2")
diff --git a/Tests/Tutorial/Step7/MathFunctions/CMakeLists.txt b/Tests/Tutorial/Step7/MathFunctions/CMakeLists.txt
index d606ac0..9961e69 100644
--- a/Tests/Tutorial/Step7/MathFunctions/CMakeLists.txt
+++ b/Tests/Tutorial/Step7/MathFunctions/CMakeLists.txt
@@ -12,7 +12,7 @@ add_custom_command (
)
set_source_files_properties (
- mysqrt.cxx PROPERTIES
+ mysqrt.cxx PROPERTIES
OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Table.h
)
diff --git a/Tests/Tutorial/Step7/MathFunctions/MakeTable.cxx b/Tests/Tutorial/Step7/MathFunctions/MakeTable.cxx
index 5402542..ef98d5f 100644
--- a/Tests/Tutorial/Step7/MathFunctions/MakeTable.cxx
+++ b/Tests/Tutorial/Step7/MathFunctions/MakeTable.cxx
@@ -1,4 +1,4 @@
-// A simple program that builds a sqrt table
+// A simple program that builds a sqrt table
#include <stdio.h>
#include <math.h>
@@ -12,14 +12,14 @@ int main (int argc, char *argv[])
{
return 1;
}
-
+
// open the output file
FILE *fout = fopen(argv[1],"w");
if (!fout)
{
return 1;
}
-
+
// create a source file with a table of square roots
fprintf(fout,"double sqrtTable[] = {\n");
for (i = 0; i < 10; ++i)
diff --git a/Tests/Tutorial/Step7/MathFunctions/mysqrt.cxx b/Tests/Tutorial/Step7/MathFunctions/mysqrt.cxx
index 33659b7..1f9b887 100644
--- a/Tests/Tutorial/Step7/MathFunctions/mysqrt.cxx
+++ b/Tests/Tutorial/Step7/MathFunctions/mysqrt.cxx
@@ -14,11 +14,11 @@ double mysqrt(double x)
{
return 0;
}
-
+
double result;
// if we have both log and exp then use them
- double delta;
+ double delta;
// use the table to help find an initial value
result = x;
diff --git a/Tests/Tutorial/Step7/build1.cmake b/Tests/Tutorial/Step7/build1.cmake
index 039d556..baa475f 100644
--- a/Tests/Tutorial/Step7/build1.cmake
+++ b/Tests/Tutorial/Step7/build1.cmake
@@ -1,5 +1,5 @@
-SET(CTEST_SOURCE_DIRECTORY "$ENV{HOME}/Dashboards/My Tests/CMake/Tests/Tutorial/Step7")
-SET(CTEST_BINARY_DIRECTORY "${CTEST_SOURCE_DIRECTORY}-build1")
+set(CTEST_SOURCE_DIRECTORY "$ENV{HOME}/Dashboards/My Tests/CMake/Tests/Tutorial/Step7")
+set(CTEST_BINARY_DIRECTORY "${CTEST_SOURCE_DIRECTORY}-build1")
-SET(CTEST_CMAKE_COMMAND "cmake")
-SET(CTEST_COMMAND "ctest -D Experimental")
+set(CTEST_CMAKE_COMMAND "cmake")
+set(CTEST_COMMAND "ctest -D Experimental")
diff --git a/Tests/Tutorial/Step7/build2.cmake b/Tests/Tutorial/Step7/build2.cmake
index 5112355..c2f2e2e 100644
--- a/Tests/Tutorial/Step7/build2.cmake
+++ b/Tests/Tutorial/Step7/build2.cmake
@@ -1,6 +1,6 @@
-SET(CTEST_SOURCE_DIRECTORY "$ENV{HOME}/Dashboards/My Tests/CMake/Tests/Tutorial/Step7")
-SET(CTEST_BINARY_DIRECTORY "${CTEST_SOURCE_DIRECTORY}-build2")
-SET(CTEST_CMAKE_GENERATOR "Visual Studio 8 2005")
+set(CTEST_SOURCE_DIRECTORY "$ENV{HOME}/Dashboards/My Tests/CMake/Tests/Tutorial/Step7")
+set(CTEST_BINARY_DIRECTORY "${CTEST_SOURCE_DIRECTORY}-build2")
+set(CTEST_CMAKE_GENERATOR "Visual Studio 8 2005")
CTEST_START("Experimental")
CTEST_CONFIGURE(BUILD "${CTEST_BINARY_DIRECTORY}")