diff options
author | Brad King <brad.king@kitware.com> | 2017-04-21 12:57:55 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2017-04-21 12:57:59 (GMT) |
commit | 1d8f0f918178c50e8ef66b01546f34cd2a126a6d (patch) | |
tree | 04d8830fb1d4b5338e9afabcb8ac3b4bb134fb05 /Source/cmLocalGenerator.h | |
parent | 0ad8e4ea658ed992841c81dca2c5eb31abc40983 (diff) | |
parent | 23691d789e198c228e5c2bb7016b3b1194fd0635 (diff) | |
download | CMake-1d8f0f918178c50e8ef66b01546f34cd2a126a6d.zip CMake-1d8f0f918178c50e8ef66b01546f34cd2a126a6d.tar.gz CMake-1d8f0f918178c50e8ef66b01546f34cd2a126a6d.tar.bz2 |
Merge topic 'enable_ptx_compilation'
23691d78 CUDA: Allow sources to be compiled to .ptx files
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !725
Diffstat (limited to 'Source/cmLocalGenerator.h')
-rw-r--r-- | Source/cmLocalGenerator.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h index 3047257..1459a05 100644 --- a/Source/cmLocalGenerator.h +++ b/Source/cmLocalGenerator.h @@ -273,7 +273,8 @@ public: // Compute object file names. std::string GetObjectFileNameWithoutTarget( const cmSourceFile& source, std::string const& dir_max, - bool* hasSourceExtension = CM_NULLPTR); + bool* hasSourceExtension = CM_NULLPTR, + char const* customOutputExtension = CM_NULLPTR); /** Fill out the static linker flags for the given target. */ void GetStaticLibraryFlags(std::string& flags, std::string const& config, |