From a7ce26d837b1c6465c995519ee91e3e0d9190826 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 14 Sep 2011 13:49:40 -0400 Subject: Move IntelVSImplicitPath project to better location This project is not part of the FortranCInterface module. Make it a sibling instead of a child directory. --- Modules/CMakeDetermineCompilerABI.cmake | 2 +- Modules/FortranCInterface/IntelVSImplicitPath/CMakeLists.txt | 11 ----------- Modules/FortranCInterface/IntelVSImplicitPath/extract.cmake | 12 ------------ Modules/FortranCInterface/IntelVSImplicitPath/hello.f | 0 Modules/IntelVSImplicitPath/CMakeLists.txt | 11 +++++++++++ Modules/IntelVSImplicitPath/extract.cmake | 12 ++++++++++++ Modules/IntelVSImplicitPath/hello.f | 0 7 files changed, 24 insertions(+), 24 deletions(-) delete mode 100644 Modules/FortranCInterface/IntelVSImplicitPath/CMakeLists.txt delete mode 100644 Modules/FortranCInterface/IntelVSImplicitPath/extract.cmake delete mode 100644 Modules/FortranCInterface/IntelVSImplicitPath/hello.f create mode 100644 Modules/IntelVSImplicitPath/CMakeLists.txt create mode 100644 Modules/IntelVSImplicitPath/extract.cmake create mode 100644 Modules/IntelVSImplicitPath/hello.f 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/FortranCInterface/IntelVSImplicitPath/CMakeLists.txt deleted file mode 100644 index e2a4b3f..0000000 --- a/Modules/FortranCInterface/IntelVSImplicitPath/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -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) diff --git a/Modules/FortranCInterface/IntelVSImplicitPath/extract.cmake b/Modules/FortranCInterface/IntelVSImplicitPath/extract.cmake deleted file mode 100644 index 055247c..0000000 --- a/Modules/FortranCInterface/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() diff --git a/Modules/FortranCInterface/IntelVSImplicitPath/hello.f b/Modules/FortranCInterface/IntelVSImplicitPath/hello.f deleted file mode 100644 index e69de29..0000000 diff --git a/Modules/IntelVSImplicitPath/CMakeLists.txt b/Modules/IntelVSImplicitPath/CMakeLists.txt new file mode 100644 index 0000000..e2a4b3f --- /dev/null +++ b/Modules/IntelVSImplicitPath/CMakeLists.txt @@ -0,0 +1,11 @@ +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) diff --git a/Modules/IntelVSImplicitPath/extract.cmake b/Modules/IntelVSImplicitPath/extract.cmake new file mode 100644 index 0000000..055247c --- /dev/null +++ b/Modules/IntelVSImplicitPath/extract.cmake @@ -0,0 +1,12 @@ +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() diff --git a/Modules/IntelVSImplicitPath/hello.f b/Modules/IntelVSImplicitPath/hello.f new file mode 100644 index 0000000..e69de29 -- cgit v0.12