Sfoglia il codice sorgente

ENH: switch to new install commands to match book text

Ken Martin 18 anni fa
parent
commit
58f0cad472

+ 3 - 2
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

+ 2 - 2
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)

+ 3 - 2
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 ()

+ 2 - 2
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)

+ 3 - 2
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 ()

+ 2 - 2
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)

+ 3 - 2
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 ()

+ 2 - 2
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)

+ 3 - 2
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 ()

+ 2 - 2
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)