From efbb122bafe7854fcae4275f6fea3cfac0327485 Mon Sep 17 00:00:00 2001 From: julie Date: Mon, 7 Feb 2011 14:37:01 +0000 Subject: Move CMake files to a subdirectory --- CMAKE/CheckTimeFunction.cmake | 28 ++++++++++++++++++++++++++++ CMAKE/lapack-config-build.cmake.in | 1 + CMAKE/lapack-config-install.cmake.in | 2 ++ CMAKE/lapack-config-version.cmake.in | 8 ++++++++ CMakeLists.txt | 8 +++----- CheckTimeFunction.cmake | 28 ---------------------------- lapack-config-install.cmake.in | 2 -- lapack-config-version.cmake.in | 8 -------- lapack-config.cmake.in | 1 - 9 files changed, 42 insertions(+), 44 deletions(-) create mode 100644 CMAKE/CheckTimeFunction.cmake create mode 100644 CMAKE/lapack-config-build.cmake.in create mode 100644 CMAKE/lapack-config-install.cmake.in create mode 100644 CMAKE/lapack-config-version.cmake.in delete mode 100644 CheckTimeFunction.cmake delete mode 100644 lapack-config-install.cmake.in delete mode 100644 lapack-config-version.cmake.in delete mode 100644 lapack-config.cmake.in diff --git a/CMAKE/CheckTimeFunction.cmake b/CMAKE/CheckTimeFunction.cmake new file mode 100644 index 0000000..350a591 --- /dev/null +++ b/CMAKE/CheckTimeFunction.cmake @@ -0,0 +1,28 @@ +# - Check if the Fortran function exists. +# CHECK_TIME_FUNCTION(FUNCTION VARIABLE TYPE) +# - macro which checks if the Fortran function exists +# FUNCTION - the name of the Fortran function +# VARIABLE - variable to store the result +# + +macro(CHECK_TIME_FUNCTION FUNCTION VARIABLE) + + try_compile(RES + ${PROJECT_BINARY_DIR}/INSTALL + ${PROJECT_SOURCE_DIR}/INSTALL + TIMING secondtst_${FUNCTION} + OUTPUT_VARIABLE OUTPUT) + + if(RES) + set(${VARIABLE} ${FUNCTION} CACHE INTERNAL "Have Fortran function ${FUNCTION}") + message(STATUS "Looking for Fortran ${FUNCTION} - found") + file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log + "Fortran ${FUNCTION} exists. ${OUTPUT} \n\n") + else(RES) + message(STATUS "Looking for Fortran ${FUNCTION} - not found") + file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log + "Fortran ${FUNCTION} does not exist. \n ${OUTPUT} \n") + endif(RES) +endmacro(CHECK_TIME_FUNCTION) + + diff --git a/CMAKE/lapack-config-build.cmake.in b/CMAKE/lapack-config-build.cmake.in new file mode 100644 index 0000000..8d60cc8 --- /dev/null +++ b/CMAKE/lapack-config-build.cmake.in @@ -0,0 +1 @@ +include("@LAPACK_BINARY_DIR@/lapack-targets.cmake") diff --git a/CMAKE/lapack-config-install.cmake.in b/CMAKE/lapack-config-install.cmake.in new file mode 100644 index 0000000..0c55fc1 --- /dev/null +++ b/CMAKE/lapack-config-install.cmake.in @@ -0,0 +1,2 @@ +get_filename_component(_SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) +include(${_SELF_DIR}/lapack-targets.cmake) diff --git a/CMAKE/lapack-config-version.cmake.in b/CMAKE/lapack-config-version.cmake.in new file mode 100644 index 0000000..2caeb4a --- /dev/null +++ b/CMAKE/lapack-config-version.cmake.in @@ -0,0 +1,8 @@ +set(PACKAGE_VERSION "@LAPACK_VERSION@") +if(NOT ${PACKAGE_FIND_VERSION} VERSION_GREATER ${PACKAGE_VERSION}) + set(PACKAGE_VERSION_COMPATIBLE 1) + if(${PACKAGE_FIND_VERSION} VERSION_EQUAL ${PACKAGE_VERSION}) + set(PACKAGE_VERSION_EXACT 1) + endif() +endif() + diff --git a/CMakeLists.txt b/CMakeLists.txt index 8bc46ee..2a9c4fc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,8 +33,6 @@ include(CTest) enable_testing() # -------------------------------------------------- -set(CMAKE_MODULE_PATH ${LAPACK_SOURCE_DIR} ${CMAKE_MODULE_PATH}) - # Organize output files. On Windows this also keeps .dll files next # to the .exe files that need them, making tests easy to run. set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${LAPACK_BINARY_DIR}/bin) @@ -151,9 +149,9 @@ if( NOT BLAS_FOUND ) else( NOT BLAS_FOUND ) export(TARGETS lapack FILE lapack-targets.cmake) endif( NOT BLAS_FOUND ) -configure_file(${LAPACK_SOURCE_DIR}/lapack-config-version.cmake.in +configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-version.cmake.in ${LAPACK_BINARY_DIR}/lapack-config-version.cmake @ONLY) -configure_file(${LAPACK_SOURCE_DIR}/lapack-config.cmake.in +configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-build.cmake.in ${LAPACK_BINARY_DIR}/lapack-config.cmake @ONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc) @@ -162,7 +160,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_D DESTINATION ${PKG_CONFIG_DIR} ) -configure_file(${LAPACK_SOURCE_DIR}/lapack-config-install.cmake.in +configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-install.cmake.in ${LAPACK_BINARY_DIR}/CMakeFiles/lapack-config.cmake @ONLY) install(FILES ${LAPACK_BINARY_DIR}/CMakeFiles/lapack-config.cmake diff --git a/CheckTimeFunction.cmake b/CheckTimeFunction.cmake deleted file mode 100644 index 55016b9..0000000 --- a/CheckTimeFunction.cmake +++ /dev/null @@ -1,28 +0,0 @@ -# - Check if the Fortran function exists. -# CHECK_TIME_FUNCTION(FUNCTION VARIABLE TYPE) -# - macro which checks if the Fortran function exists -# FUNCTION - the name of the Fortran function -# VARIABLE - variable to store the result -# - -macro(CHECK_TIME_FUNCTION FUNCTION VARIABLE) - - try_compile(RES - ${PROJECT_BINARY_DIR}/INSTALL - ${PROJECT_SOURCE_DIR}/INSTALL - TIMING secondtst_${FUNCTION} - OUTPUT_VARIABLE OUTPUT) - - if(RES) - set(${VARIABLE} ${FUNCTION} CACHE INTERNAL "Have Fortran function ${FUNCTION}") - message(STATUS "Looking for Fortran ${FUNCTION} - found") - file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log - "Fortran ${FUNCTION} exists. ${OUTPUT} \n\n") - else(RES) - message(STATUS "Looking for Fortran ${FUNCTION} - not found") - file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log - "Fortran ${FUNCTION} does not exist. \n ${OUTPUT} \n") - endif(RES) -endmacro(CHECK_TIME_FUNCTION) - - diff --git a/lapack-config-install.cmake.in b/lapack-config-install.cmake.in deleted file mode 100644 index 0c55fc1..0000000 --- a/lapack-config-install.cmake.in +++ /dev/null @@ -1,2 +0,0 @@ -get_filename_component(_SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) -include(${_SELF_DIR}/lapack-targets.cmake) diff --git a/lapack-config-version.cmake.in b/lapack-config-version.cmake.in deleted file mode 100644 index 2caeb4a..0000000 --- a/lapack-config-version.cmake.in +++ /dev/null @@ -1,8 +0,0 @@ -set(PACKAGE_VERSION "@LAPACK_VERSION@") -if(NOT ${PACKAGE_FIND_VERSION} VERSION_GREATER ${PACKAGE_VERSION}) - set(PACKAGE_VERSION_COMPATIBLE 1) - if(${PACKAGE_FIND_VERSION} VERSION_EQUAL ${PACKAGE_VERSION}) - set(PACKAGE_VERSION_EXACT 1) - endif() -endif() - diff --git a/lapack-config.cmake.in b/lapack-config.cmake.in deleted file mode 100644 index 8d60cc8..0000000 --- a/lapack-config.cmake.in +++ /dev/null @@ -1 +0,0 @@ -include("@LAPACK_BINARY_DIR@/lapack-targets.cmake") -- cgit v0.11.2