[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3892-ga842a21
Brad King
brad.king at kitware.com
Thu Aug 15 08:05:18 EDT 2013
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 a842a2151e972791e5072984be642fe5acdb8170 (commit)
via d7a65a2f2cdaf36e42fe9c0d2a9ff55fecb79dc4 (commit)
from 78c5005c2fca984359387e9332d1e618b10626af (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=a842a2151e972791e5072984be642fe5acdb8170
commit a842a2151e972791e5072984be642fe5acdb8170
Merge: 78c5005 d7a65a2
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 15 08:05:00 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 15 08:05:00 2013 -0400
Merge topic 'FortranCInterface-cross-compile' into next
d7a65a2 FortranCInterface: Fix cross-compiling Linux to MinGW (#14358)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d7a65a2f2cdaf36e42fe9c0d2a9ff55fecb79dc4
commit d7a65a2f2cdaf36e42fe9c0d2a9ff55fecb79dc4
Author: Michel Zou <xantares09 at hotmail.com>
AuthorDate: Wed Aug 14 19:28:35 2013 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Aug 14 19:31:31 2013 -0400
FortranCInterface: Fix cross-compiling Linux to MinGW (#14358)
After building the test binary tell find_program to search for it with
the ${CMAKE_EXECUTABLE_SUFFIX} so that the .exe can be found. Since
find_program is normally used to locate host tools while cross-compiling
it needs this hint to find the target binary.
Suggested-by: Denis Barbier <bouzim at gmail.com>
diff --git a/Modules/FortranCInterface/Detect.cmake b/Modules/FortranCInterface/Detect.cmake
index 798c44c..afeb9c5 100644
--- a/Modules/FortranCInterface/Detect.cmake
+++ b/Modules/FortranCInterface/Detect.cmake
@@ -49,7 +49,7 @@ unset(FortranCInterface_COMPILED CACHE)
# Locate the sample project executable.
if(FortranCInterface_COMPILED)
find_program(FortranCInterface_EXE
- NAMES FortranCInterface
+ NAMES FortranCInterface${CMAKE_EXECUTABLE_SUFFIX}
PATHS ${FortranCInterface_BINARY_DIR} ${FortranCInterface_BINARY_DIR}/Debug
NO_DEFAULT_PATH
)
-----------------------------------------------------------------------
Summary of changes:
Modules/FortranCInterface/Detect.cmake | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list