From 58f0cad472e8f23563bc51ae579f15f2d02f50a9 Mon Sep 17 00:00:00 2001 From: Ken Martin Date: Tue, 13 Nov 2007 11:11:03 -0500 Subject: ENH: switch to new install commands to match book text --- Tests/Tutorial/Step3/CMakeLists.txt | 5 +++-- Tests/Tutorial/Step3/MathFunctions/CMakeLists.txt | 4 ++-- Tests/Tutorial/Step4/CMakeLists.txt | 5 +++-- Tests/Tutorial/Step4/MathFunctions/CMakeLists.txt | 4 ++-- Tests/Tutorial/Step5/CMakeLists.txt | 5 +++-- Tests/Tutorial/Step5/MathFunctions/CMakeLists.txt | 4 ++-- Tests/Tutorial/Step6/CMakeLists.txt | 5 +++-- Tests/Tutorial/Step6/MathFunctions/CMakeLists.txt | 4 ++-- Tests/Tutorial/Step7/CMakeLists.txt | 5 +++-- Tests/Tutorial/Step7/MathFunctions/CMakeLists.txt | 4 ++-- 10 files changed, 25 insertions(+), 20 deletions(-) diff --git a/Tests/Tutorial/Step3/CMakeLists.txt b/Tests/Tutorial/Step3/CMakeLists.txt index a5009f1..5481bce 100644 --- a/Tests/Tutorial/Step3/CMakeLists.txt +++ b/Tests/Tutorial/Step3/CMakeLists.txt @@ -30,8 +30,9 @@ add_executable (Tutorial tutorial.cxx) target_link_libraries (Tutorial ${EXTRA_LIBS}) # add the install targets -install_targets (/bin Tutorial) -install_files (/include FILES "${PROJECT_BINARY_DIR}/TutorialConfig.h") +install (TARGETS Tutorial DESTINATION bin) +install (FILES "${PROJECT_BINARY_DIR}/TutorialConfig.h" + DESTINATION include) # enable testing diff --git a/Tests/Tutorial/Step3/MathFunctions/CMakeLists.txt b/Tests/Tutorial/Step3/MathFunctions/CMakeLists.txt index 329c204..f386036 100644 --- a/Tests/Tutorial/Step3/MathFunctions/CMakeLists.txt +++ b/Tests/Tutorial/Step3/MathFunctions/CMakeLists.txt @@ -1,4 +1,4 @@ add_library(MathFunctions mysqrt.cxx) -install_targets (/bin MathFunctions) -install_files (/include FILES MathFunctions.h) +install (TARGETS MathFunctions DESTINATION bin) +install (FILES MathFunctions.h DESTINATION include) diff --git a/Tests/Tutorial/Step4/CMakeLists.txt b/Tests/Tutorial/Step4/CMakeLists.txt index 225c222..19d24fd 100644 --- a/Tests/Tutorial/Step4/CMakeLists.txt +++ b/Tests/Tutorial/Step4/CMakeLists.txt @@ -35,8 +35,9 @@ add_executable (Tutorial tutorial.cxx) target_link_libraries (Tutorial ${EXTRA_LIBS}) # add the install targets -install_targets (/bin Tutorial) -install_files (/include FILES "${PROJECT_BINARY_DIR}/TutorialConfig.h") +install (TARGETS Tutorial DESTINATION bin) +install (FILES "${PROJECT_BINARY_DIR}/TutorialConfig.h" + DESTINATION include) # enable testing enable_testing () diff --git a/Tests/Tutorial/Step4/MathFunctions/CMakeLists.txt b/Tests/Tutorial/Step4/MathFunctions/CMakeLists.txt index 329c204..f386036 100644 --- a/Tests/Tutorial/Step4/MathFunctions/CMakeLists.txt +++ b/Tests/Tutorial/Step4/MathFunctions/CMakeLists.txt @@ -1,4 +1,4 @@ add_library(MathFunctions mysqrt.cxx) -install_targets (/bin MathFunctions) -install_files (/include FILES MathFunctions.h) +install (TARGETS MathFunctions DESTINATION bin) +install (FILES MathFunctions.h DESTINATION include) diff --git a/Tests/Tutorial/Step5/CMakeLists.txt b/Tests/Tutorial/Step5/CMakeLists.txt index c8b2742..9aed227 100644 --- a/Tests/Tutorial/Step5/CMakeLists.txt +++ b/Tests/Tutorial/Step5/CMakeLists.txt @@ -35,8 +35,9 @@ add_executable (Tutorial tutorial.cxx) target_link_libraries (Tutorial ${EXTRA_LIBS}) # add the install targets -install_targets (/bin Tutorial) -install_files (/include FILES "${PROJECT_BINARY_DIR}/TutorialConfig.h") +install (TARGETS Tutorial DESTINATION bin) +install (FILES "${PROJECT_BINARY_DIR}/TutorialConfig.h" + DESTINATION include) # enable testing enable_testing () diff --git a/Tests/Tutorial/Step5/MathFunctions/CMakeLists.txt b/Tests/Tutorial/Step5/MathFunctions/CMakeLists.txt index 8ecddfa..d606ac0 100644 --- a/Tests/Tutorial/Step5/MathFunctions/CMakeLists.txt +++ b/Tests/Tutorial/Step5/MathFunctions/CMakeLists.txt @@ -22,5 +22,5 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ) # add the main library add_library(MathFunctions mysqrt.cxx) -install_targets (/bin MathFunctions) -install_files (/include FILES MathFunctions.h) +install (TARGETS MathFunctions DESTINATION bin) +install (FILES MathFunctions.h DESTINATION include) diff --git a/Tests/Tutorial/Step6/CMakeLists.txt b/Tests/Tutorial/Step6/CMakeLists.txt index c4e0a5e..3ab8b3b 100644 --- a/Tests/Tutorial/Step6/CMakeLists.txt +++ b/Tests/Tutorial/Step6/CMakeLists.txt @@ -35,8 +35,9 @@ add_executable (Tutorial tutorial.cxx) target_link_libraries (Tutorial ${EXTRA_LIBS}) # add the install targets -install_targets (/bin Tutorial) -install_files (/include FILES "${PROJECT_BINARY_DIR}/TutorialConfig.h") +install (TARGETS Tutorial DESTINATION bin) +install (FILES "${PROJECT_BINARY_DIR}/TutorialConfig.h" + DESTINATION include) # enable testing enable_testing () diff --git a/Tests/Tutorial/Step6/MathFunctions/CMakeLists.txt b/Tests/Tutorial/Step6/MathFunctions/CMakeLists.txt index 8ecddfa..d606ac0 100644 --- a/Tests/Tutorial/Step6/MathFunctions/CMakeLists.txt +++ b/Tests/Tutorial/Step6/MathFunctions/CMakeLists.txt @@ -22,5 +22,5 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ) # add the main library add_library(MathFunctions mysqrt.cxx) -install_targets (/bin MathFunctions) -install_files (/include FILES MathFunctions.h) +install (TARGETS MathFunctions DESTINATION bin) +install (FILES MathFunctions.h DESTINATION include) diff --git a/Tests/Tutorial/Step7/CMakeLists.txt b/Tests/Tutorial/Step7/CMakeLists.txt index 6b7472c..319327f 100644 --- a/Tests/Tutorial/Step7/CMakeLists.txt +++ b/Tests/Tutorial/Step7/CMakeLists.txt @@ -35,8 +35,9 @@ add_executable (Tutorial tutorial.cxx) target_link_libraries (Tutorial ${EXTRA_LIBS}) # add the install targets -install_targets (/bin Tutorial) -install_files (/include FILES "${PROJECT_BINARY_DIR}/TutorialConfig.h") +install (TARGETS Tutorial DESTINATION bin) +install (FILES "${PROJECT_BINARY_DIR}/TutorialConfig.h" + DESTINATION include) # enable testing enable_testing () diff --git a/Tests/Tutorial/Step7/MathFunctions/CMakeLists.txt b/Tests/Tutorial/Step7/MathFunctions/CMakeLists.txt index 8ecddfa..d606ac0 100644 --- a/Tests/Tutorial/Step7/MathFunctions/CMakeLists.txt +++ b/Tests/Tutorial/Step7/MathFunctions/CMakeLists.txt @@ -22,5 +22,5 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ) # add the main library add_library(MathFunctions mysqrt.cxx) -install_targets (/bin MathFunctions) -install_files (/include FILES MathFunctions.h) +install (TARGETS MathFunctions DESTINATION bin) +install (FILES MathFunctions.h DESTINATION include) -- cgit v0.12