kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'ExternalProject-byproducts-tokens'

Browse Source 
86032ae0 ExternalProject: Replace placeholder tokens in BYPRODUCTS
This commit is contained in:
Brad King 2015-03-10 09:12:32 -04:00 committed by CMake Topic Stage
commit cce9671b4f
3 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Help/release/dev/ExternalProject-byproducts-tokens.rst Normal file
View File

@ -0,0 +1,5 @@
ExternalProject-byproducts-tokens
---------------------------------
* The :module:`ExternalProject` module learned to replace tokens
like ``<BINARY_DIR>`` in the ``BYPRODUCTS`` of each step.

6
Modules/ExternalProject.cmake
View File

@ -251,8 +251,8 @@ Create custom targets to build projects in external trees
``LOG 1`` ``LOG 1``
Wrap step in script to log output Wrap step in script to log output
The command line, comment, and working directory of every standard and The command line, comment, working directory, and byproducts of every
custom step is processed to replace tokens ``<SOURCE_DIR>``, standard and custom step are processed to replace tokens ``<SOURCE_DIR>``,
``<BINARY_DIR>``, ``<INSTALL_DIR>``, and ``<TMP_DIR>`` with ``<BINARY_DIR>``, ``<INSTALL_DIR>``, and ``<TMP_DIR>`` with
corresponding property values. corresponding property values.
@ -1443,7 +1443,7 @@ function(ExternalProject_Add_Step name step)
endif() endif()
# Replace location tags. # Replace location tags.
_ep_replace_location_tags(${name} comment command work_dir) _ep_replace_location_tags(${name} comment command work_dir byproducts)
# Custom comment? # Custom comment?
get_property(comment_set TARGET ${name} PROPERTY _EP_${step}_COMMENT SET) get_property(comment_set TARGET ${name} PROPERTY _EP_${step}_COMMENT SET)

21
Tests/CustomCommandByproducts/CMakeLists.txt
View File

@ -102,6 +102,27 @@ add_library(ExternalLibrary STATIC IMPORTED)
set_property(TARGET ExternalLibrary PROPERTY IMPORTED_LOCATION ${ExternalLibrary_LIBRARY}) set_property(TARGET ExternalLibrary PROPERTY IMPORTED_LOCATION ${ExternalLibrary_LIBRARY})
add_dependencies(ExternalLibrary ExternalTarget) add_dependencies(ExternalLibrary ExternalTarget)
# Generate the library file of an imported target as a byproduct
# of an external project. The byproduct uses <BINARY_DIR> that is substituted
# by the real binary path
if(CMAKE_CONFIGURATION_TYPES)
set(cfg /${CMAKE_CFG_INTDIR})
else()
set(cfg)
endif()
include(ExternalProject)
ExternalProject_Add(ExtTargetSubst
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/External"
DOWNLOAD_COMMAND ""
INSTALL_COMMAND ""
BUILD_BYPRODUCTS "<BINARY_DIR>${cfg}/${CMAKE_STATIC_LIBRARY_PREFIX}ExternalLibrary${CMAKE_STATIC_LIBRARY_SUFFIX}"
)
ExternalProject_Get_Property(ExtTargetSubst binary_dir)
add_library(ExternalLibraryWithSubstitution STATIC IMPORTED)
set_property(TARGET ExternalLibraryWithSubstitution PROPERTY IMPORTED_LOCATION
${binary_dir}${cfg}/${CMAKE_STATIC_LIBRARY_PREFIX}ExternalLibrary${CMAKE_STATIC_LIBRARY_SUFFIX})
add_dependencies(ExternalLibraryWithSubstitution ExtTargetSubst)
# Add an executable consuming all the byproducts. # Add an executable consuming all the byproducts.
add_executable(CustomCommandByproducts add_executable(CustomCommandByproducts
CustomCommandByproducts.c CustomCommandByproducts.c