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 948182700bccec42f8c68251df75e4cadcc663a4 (commit)
via 487f147fa9422e654c86c467c80d7620a65b6c45 (commit)
from 42d0d445199bd735a39d7b86fa1e6375ad17bbe0 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=948182700bccec42f8c68251df75e4cadcc663a4
commit 948182700bccec42f8c68251df75e4cadcc663a4
Merge: 42d0d44 487f147
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Aug 27 09:26:29 2014 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Aug 27 09:26:29 2014 -0400
Merge topic 'asm-user-override-files' into next
487f147f Load CMAKE_USER_MAKE_RULES_OVERRIDE[_ASM] for assembler (#15108)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=487f147fa9422e654c86c467c80d7620a65b6c45
commit 487f147fa9422e654c86c467c80d7620a65b6c45
Author: Mikhail Nikonov <michael.niko...@mail.ru>
AuthorDate: Tue Aug 26 04:44:16 2014 +0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Aug 27 09:27:36 2014 -0400
Load CMAKE_USER_MAKE_RULES_OVERRIDE[_ASM] for assembler (#15108)
This is already done for C, CXX, and Fortran.
diff --git a/Modules/CMakeASMInformation.cmake
b/Modules/CMakeASMInformation.cmake
index dce1624..62ef972 100644
--- a/Modules/CMakeASMInformation.cmake
+++ b/Modules/CMakeASMInformation.cmake
@@ -50,6 +50,24 @@ if(NOT _INCLUDED_FILE)
include(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME} OPTIONAL)
endif()
+# This should be included before the _INIT variables are
+# used to initialize the cache. Since the rule variables
+# have if blocks on them, users can still define them here.
+# But, it should still be after the platform file so changes can
+# be made to those values.
+
+if(CMAKE_USER_MAKE_RULES_OVERRIDE)
+ # Save the full path of the file so try_compile can use it.
+ include(${CMAKE_USER_MAKE_RULES_OVERRIDE} RESULT_VARIABLE _override)
+ set(CMAKE_USER_MAKE_RULES_OVERRIDE "${_override}")
+endif()
+
+if(CMAKE_USER_MAKE_RULES_OVERRIDE_ASM)
+ # Save the full path of the file so try_compile can use it.
+ include(${CMAKE_USER_MAKE_RULES_OVERRIDE_ASM} RESULT_VARIABLE _override)
+ set(CMAKE_USER_MAKE_RULES_OVERRIDE_ASM "${_override}")
+endif()
+
# Set default assembler file extensions:
if(NOT CMAKE_ASM${ASM_DIALECT}_SOURCE_FILE_EXTENSIONS)
set(CMAKE_ASM${ASM_DIALECT}_SOURCE_FILE_EXTENSIONS s;S;asm)
-----------------------------------------------------------------------
Summary of changes:
Modules/CMakeASMInformation.cmake | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
