[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.4 1.4.4.1
cmake-commits at cmake.org
cmake-commits at cmake.org
Fri Oct 9 16:11:49 EDT 2009
Update of /cvsroot/CMake/CMake/Tests/Tutorial/Step5/MathFunctions
In directory public:/mounts/ram/cvs-serv13963/Tests/Tutorial/Step5/MathFunctions
Modified Files:
Tag: CMake-2-8
CMakeLists.txt
Log Message:
Merge in changes for RC 3
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/Tutorial/Step5/MathFunctions/CMakeLists.txt,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -C 2 -d -r1.4 -r1.4.4.1
*** CMakeLists.txt 13 Nov 2007 16:11:03 -0000 1.4
--- CMakeLists.txt 9 Oct 2009 20:11:47 -0000 1.4.4.1
***************
*** 1,25 ****
# first we add the executable that generates the table
! add_executable(MakeTable MakeTable.cxx)
!
! get_target_property(MakeTableLocation MakeTable LOCATION)
# add the command to generate the source code
add_custom_command (
OUTPUT ${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)
install (TARGETS MathFunctions DESTINATION bin)
--- 1,16 ----
# first we add the executable that generates the table
! # 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
)
# add the main library
! add_library(MathFunctions mysqrt.cxx ${CMAKE_CURRENT_BINARY_DIR}/Table.h )
install (TARGETS MathFunctions DESTINATION bin)
More information about the Cmake-commits
mailing list