[Cmake-commits] CMake branch, next, updated. v3.4.1-1825-g3f07257

Chuck Atkins chuck.atkins at kitware.com
Wed Dec 30 10:55:51 EST 2015


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  3f0725765641ba3dff41f135c5a23b089ac40e1b (commit)
       via  64e26850fc2a98994424a34eada9bec90f384c7e (commit)
       via  69374919fd3fde3cd414eddfe01be79d16908391 (commit)
       via  9fdb66cff6c28fa279ff510ae9af6662b155524f (commit)
       via  1d73f6525c523661e51173829b327acf9de9dfc4 (commit)
       via  0b3b5fb16984e81639a92796ddf1f846ae6e8cea (commit)
       via  630e444e97df52d35a93d22c54359881c1e11193 (commit)
       via  554c3074556fb8fbf4918fc3e2ea3bef97add1ad (commit)
       via  56653b81b85c7484a37b6574a1f4b628f462c717 (commit)
       via  8a45573e99165e926482b07da5ceb3dd86307ea5 (commit)
      from  2aa03802ead74a2adbcb2687b6a17e783add47db (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3f0725765641ba3dff41f135c5a23b089ac40e1b
commit 3f0725765641ba3dff41f135c5a23b089ac40e1b
Merge: 2aa0380 64e2685
Author:     Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Wed Dec 30 10:55:50 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Dec 30 10:55:50 2015 -0500

    Merge topic 'cray-prgev-cleanup' into next
    
    64e26850 CrayPrgEnv: Cleanup binaries from implicit compile flag detection
    69374919 CMake Nightly Date Stamp
    9fdb66cf CMake Nightly Date Stamp
    1d73f652 CMake Nightly Date Stamp
    0b3b5fb1 CMake Nightly Date Stamp
    630e444e CMake Nightly Date Stamp
    554c3074 CMake Nightly Date Stamp
    56653b81 CMake Nightly Date Stamp
    8a45573e CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=64e26850fc2a98994424a34eada9bec90f384c7e
commit 64e26850fc2a98994424a34eada9bec90f384c7e
Author:     Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Tue Dec 29 12:08:35 2015 -0500
Commit:     Chuck Atkins <chuck.atkins at kitware.com>
CommitDate: Tue Dec 29 10:21:07 2015 -0700

    CrayPrgEnv: Cleanup binaries from implicit compile flag detection

diff --git a/Modules/Compiler/CrayPrgEnv.cmake b/Modules/Compiler/CrayPrgEnv.cmake
index 61daa0f..fa39b00 100644
--- a/Modules/Compiler/CrayPrgEnv.cmake
+++ b/Modules/Compiler/CrayPrgEnv.cmake
@@ -16,13 +16,16 @@ macro(__cray_extract_args cmd tag_regex out_var make_absolute)
 endmacro()
 
 function(__cray_extract_implicit src compiler_cmd link_cmd lang include_dirs_var link_dirs_var link_libs_var)
+  set(BIN "${CMAKE_PLATFORM_INFO_DIR}/CrayExtractImplicit_${lang}.bin")
   execute_process(
-    COMMAND ${CMAKE_${lang}_COMPILER}
-      ${CMAKE_${lang}_VERBOSE_FLAG} -o cray_extract_implicit_${lang} ${src}
+    COMMAND ${CMAKE_${lang}_COMPILER} ${CMAKE_${lang}_VERBOSE_FLAG} -o ${BIN}
     RESULT_VARIABLE result
     OUTPUT_VARIABLE output
     ERROR_VARIABLE error
     )
+  if(EXISTS "${BIN}")
+    file(REMOVE "${BIN}")
+  endif()
   set(include_dirs)
   set(link_dirs)
   set(link_libs)

-----------------------------------------------------------------------

Summary of changes:
 Modules/Compiler/CrayPrgEnv.cmake |    7 +++++--
 Source/CMakeVersion.cmake         |    2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list