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 b561c86f71d3bf27f715a6da9adebbaf54d48bf2 (commit) via 67fcc838d9e857de2697c2fbe34e40ac095973dc (commit) via a7ce26d837b1c6465c995519ee91e3e0d9190826 (commit) from 55e31ef3a48c4f1b1e63684d2fc382a081f2d7b0 (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=b561c86f71d3bf27f715a6da9adebbaf54d48bf2 commit b561c86f71d3bf27f715a6da9adebbaf54d48bf2 Merge: 55e31ef 67fcc83 Author: Brad King <brad.k...@kitware.com> AuthorDate: Wed Sep 14 14:09:27 2011 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Wed Sep 14 14:09:27 2011 -0400 Merge topic 'FortranCInterface-VS' into next 67fcc83 Simplify IntelVSImplicitPath detection project a7ce26d Move IntelVSImplicitPath project to better location http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=67fcc838d9e857de2697c2fbe34e40ac095973dc commit 67fcc838d9e857de2697c2fbe34e40ac095973dc Author: Brad King <brad.k...@kitware.com> AuthorDate: Wed Sep 14 13:59:23 2011 -0400 Commit: Brad King <brad.k...@kitware.com> CommitDate: Wed Sep 14 14:06:02 2011 -0400 Simplify IntelVSImplicitPath detection project Use the ENV{LIB} variable directly instead of parsing the output of the whole environment from "set". Store the output in a .cmake script and include it from CMakeDetermineCompilerABI instead of using file(READ). diff --git a/Modules/CMakeDetermineCompilerABI.cmake b/Modules/CMakeDetermineCompilerABI.cmake index 6792b7a..a808a28 100644 --- a/Modules/CMakeDetermineCompilerABI.cmake +++ b/Modules/CMakeDetermineCompilerABI.cmake @@ -98,13 +98,10 @@ FUNCTION(CMAKE_DETERMINE_COMPILER_ABI lang src) CMAKE_FLAGS "-DCMAKE_Fortran_FLAGS:STRING=${CMAKE_Fortran_FLAGS}" OUTPUT_VARIABLE _output) - FILE(READ - ${CMAKE_BINARY_DIR}/CMakeFiles/IntelVSImplicitPath/implict_link.txt - dir) - LIST(APPEND implicit_dirs "${dir}") FILE(WRITE "${CMAKE_BINARY_DIR}/CMakeFiles/IntelVSImplicitPath/output.txt" "${_output}") + INCLUDE(${CMAKE_BINARY_DIR}/CMakeFiles/IntelVSImplicitPath/output.cmake OPTIONAL) SET(_desc "Determine Intel Fortran Compiler Implicit Link Path -- done") MESSAGE(STATUS "${_desc}") ENDIF() diff --git a/Modules/IntelVSImplicitPath/CMakeLists.txt b/Modules/IntelVSImplicitPath/CMakeLists.txt index e2a4b3f..96dc4e6 100644 --- a/Modules/IntelVSImplicitPath/CMakeLists.txt +++ b/Modules/IntelVSImplicitPath/CMakeLists.txt @@ -1,11 +1,7 @@ cmake_minimum_required (VERSION 2.8) project(IntelFortranImplicit Fortran) -add_custom_command(OUTPUT ${IntelFortranImplicit_BINARY_DIR}/env.txt - COMMAND set > ${IntelFortranImplicit_BINARY_DIR}/env.txt) -add_library(FortranLib hello.f - ${IntelFortranImplicit_BINARY_DIR}/env.txt) -add_custom_target(ExtractLibPath ALL - COMMAND ${CMAKE_COMMAND} -P ${IntelFortranImplicit_SOURCE_DIR}/extract.cmake - WORKING_DIRECTORY ${IntelFortranImplicit_BINARY_DIR} -) -add_dependencies(ExtractLibPath FortranLib) +add_custom_command( + OUTPUT output.cmake + COMMAND ${CMAKE_COMMAND} -P ${IntelFortranImplicit_SOURCE_DIR}/detect.cmake + ) +add_library(FortranLib hello.f output.cmake) diff --git a/Modules/IntelVSImplicitPath/detect.cmake b/Modules/IntelVSImplicitPath/detect.cmake new file mode 100644 index 0000000..20753be --- /dev/null +++ b/Modules/IntelVSImplicitPath/detect.cmake @@ -0,0 +1,9 @@ +# look at each path and try to find ifconsol.lib +set(LIB "$ENV{LIB}") +foreach(dir ${LIB}) + file(TO_CMAKE_PATH "${dir}" dir) + if(EXISTS "${dir}/ifconsol.lib") + file(WRITE output.cmake "list(APPEND implicit_dirs \"${dir}\")\n") + break() + endif() +endforeach() diff --git a/Modules/IntelVSImplicitPath/extract.cmake b/Modules/IntelVSImplicitPath/extract.cmake deleted file mode 100644 index 055247c..0000000 --- a/Modules/IntelVSImplicitPath/extract.cmake +++ /dev/null @@ -1,12 +0,0 @@ -file(STRINGS env.txt LIB REGEX "^LIB=.*$") -string(REPLACE "LIB=" "" LIB "${LIB}" ) -# change LIB from a string to a ; separated list of paths -set(LIB ${LIB}) -# look at each path and try to find ifconsol.lib -foreach( dir ${LIB}) - file(TO_CMAKE_PATH "${dir}" dir) - if(EXISTS "${dir}/ifconsol.lib") - file(WRITE implict_link.txt ${dir}) - return() - endif() -endforeach() http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a7ce26d837b1c6465c995519ee91e3e0d9190826 commit a7ce26d837b1c6465c995519ee91e3e0d9190826 Author: Brad King <brad.k...@kitware.com> AuthorDate: Wed Sep 14 13:49:40 2011 -0400 Commit: Brad King <brad.k...@kitware.com> CommitDate: Wed Sep 14 13:49:40 2011 -0400 Move IntelVSImplicitPath project to better location This project is not part of the FortranCInterface module. Make it a sibling instead of a child directory. diff --git a/Modules/CMakeDetermineCompilerABI.cmake b/Modules/CMakeDetermineCompilerABI.cmake index 528c327..6792b7a 100644 --- a/Modules/CMakeDetermineCompilerABI.cmake +++ b/Modules/CMakeDetermineCompilerABI.cmake @@ -93,7 +93,7 @@ FUNCTION(CMAKE_DETERMINE_COMPILER_ABI lang src) # Build a sample project which reports symbols. TRY_COMPILE(IFORT_LIB_PATH_COMPILED ${CMAKE_BINARY_DIR}/CMakeFiles/IntelVSImplicitPath - ${CMAKE_ROOT}/Modules/FortranCInterface/IntelVSImplicitPath + ${CMAKE_ROOT}/Modules/IntelVSImplicitPath IntelFortranImplicit CMAKE_FLAGS "-DCMAKE_Fortran_FLAGS:STRING=${CMAKE_Fortran_FLAGS}" diff --git a/Modules/FortranCInterface/IntelVSImplicitPath/CMakeLists.txt b/Modules/IntelVSImplicitPath/CMakeLists.txt similarity index 100% rename from Modules/FortranCInterface/IntelVSImplicitPath/CMakeLists.txt rename to Modules/IntelVSImplicitPath/CMakeLists.txt diff --git a/Modules/FortranCInterface/IntelVSImplicitPath/extract.cmake b/Modules/IntelVSImplicitPath/extract.cmake similarity index 100% rename from Modules/FortranCInterface/IntelVSImplicitPath/extract.cmake rename to Modules/IntelVSImplicitPath/extract.cmake diff --git a/Modules/FortranCInterface/IntelVSImplicitPath/hello.f b/Modules/IntelVSImplicitPath/hello.f similarity index 100% rename from Modules/FortranCInterface/IntelVSImplicitPath/hello.f rename to Modules/IntelVSImplicitPath/hello.f ----------------------------------------------------------------------- Summary of changes: Modules/CMakeDetermineCompilerABI.cmake | 7 ++----- .../IntelVSImplicitPath/CMakeLists.txt | 11 ----------- .../IntelVSImplicitPath/extract.cmake | 12 ------------ Modules/IntelVSImplicitPath/CMakeLists.txt | 7 +++++++ Modules/IntelVSImplicitPath/detect.cmake | 9 +++++++++ .../IntelVSImplicitPath/hello.f | 0 6 files changed, 18 insertions(+), 28 deletions(-) delete mode 100644 Modules/FortranCInterface/IntelVSImplicitPath/CMakeLists.txt delete mode 100644 Modules/FortranCInterface/IntelVSImplicitPath/extract.cmake create mode 100644 Modules/IntelVSImplicitPath/CMakeLists.txt create mode 100644 Modules/IntelVSImplicitPath/detect.cmake rename Modules/{FortranCInterface => }/IntelVSImplicitPath/hello.f (100%) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits