diff options
author | Stephen Kelly <steveire@gmail.com> | 2013-12-26 13:34:27 (GMT) |
---|---|---|
committer | Stephen Kelly <steveire@gmail.com> | 2014-01-06 16:25:11 (GMT) |
commit | 84fac67f90b275116efa9ec25f5fcb2c2bf7f6b4 (patch) | |
tree | 0d0d5b59269c8edc078450b8aeecc519affa6a2f /Source/cmExportCommand.cxx | |
parent | faedd2bea9c98fddd9e9f70deebdb53f8f369124 (diff) | |
download | CMake-84fac67f90b275116efa9ec25f5fcb2c2bf7f6b4.zip CMake-84fac67f90b275116efa9ec25f5fcb2c2bf7f6b4.tar.gz CMake-84fac67f90b275116efa9ec25f5fcb2c2bf7f6b4.tar.bz2 |
Don't allow include() of export(EXPORT) file at configure time.
As a new feature it does not need to participate in CMP0024.
Store cmExportBuildFileGenerator instances which correspond to the
export(EXPORT) signature in a second map which does not own the
pointers. This avoids the need to add cmExportBuildFileGenerator
and dependencies to the bootstrap system.
Diffstat (limited to 'Source/cmExportCommand.cxx')
-rw-r--r-- | Source/cmExportCommand.cxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Source/cmExportCommand.cxx b/Source/cmExportCommand.cxx index b6bf870..7c97d8d 100644 --- a/Source/cmExportCommand.cxx +++ b/Source/cmExportCommand.cxx @@ -236,8 +236,14 @@ bool cmExportCommand { ebfg->AddConfiguration(""); } - - gg->AddBuildExportSet(ebfg); + if (this->ExportSet) + { + gg->AddBuildExportExportSet(ebfg); + } + else + { + gg->AddBuildExportSet(ebfg); + } return true; } |