summaryrefslogtreecommitdiffstats
path: root/Tests/Tutorial
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2009-10-05 02:55:02 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2009-10-05 02:55:02 (GMT)
commit1bc355b7113c11ca085792d1b13e5f119e0880b4 (patch)
tree1e559fa957d4b35d7f71b5d6368fabf6d279454c /Tests/Tutorial
parentb272c619458ebd108d0f2183082d67d1faed917b (diff)
downloadCMake-1bc355b7113c11ca085792d1b13e5f119e0880b4.zip
CMake-1bc355b7113c11ca085792d1b13e5f119e0880b4.tar.gz
CMake-1bc355b7113c11ca085792d1b13e5f119e0880b4.tar.bz2
Use new style header generation and get rid of OBJECT_DEPENDS in tutorial
Diffstat (limited to 'Tests/Tutorial')
-rw-r--r--Tests/Tutorial/Step5/MathFunctions/CMakeLists.txt19
1 files changed, 5 insertions, 14 deletions
diff --git a/Tests/Tutorial/Step5/MathFunctions/CMakeLists.txt b/Tests/Tutorial/Step5/MathFunctions/CMakeLists.txt
index d606ac0..453a463 100644
--- a/Tests/Tutorial/Step5/MathFunctions/CMakeLists.txt
+++ b/Tests/Tutorial/Step5/MathFunctions/CMakeLists.txt
@@ -1,26 +1,17 @@
# first we add the executable that generates the table
-add_executable(MakeTable MakeTable.cxx)
-
-get_target_property(MakeTableLocation MakeTable LOCATION)
+# add the binary tree directory to the search path for include files
+include_directories( ${CMAKE_CURRENT_BINARY_DIR} )
+add_executable(MakeTable MakeTable.cxx )
# add the command to generate the source code
add_custom_command (
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/Table.h
+ COMMAND MakeTable ${CMAKE_CURRENT_BINARY_DIR}/Table.h
DEPENDS MakeTable
- COMMAND ${MakeTableLocation}
- ARGS ${CMAKE_CURRENT_BINARY_DIR}/Table.h
- )
-
-set_source_files_properties (
- mysqrt.cxx PROPERTIES
- OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Table.h
)
-# add the binary tree directory to the search path for include files
-include_directories( ${CMAKE_CURRENT_BINARY_DIR} )
-
# add the main library
-add_library(MathFunctions mysqrt.cxx)
+add_library(MathFunctions mysqrt.cxx ${CMAKE_CURRENT_BINARY_DIR}/Table.h )
install (TARGETS MathFunctions DESTINATION bin)
install (FILES MathFunctions.h DESTINATION include)