summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjulie <julielangou@users.noreply.github.com>2011-02-07 14:37:01 (GMT)
committerjulie <julielangou@users.noreply.github.com>2011-02-07 14:37:01 (GMT)
commitefbb122bafe7854fcae4275f6fea3cfac0327485 (patch)
treef28ea098389d0fed5b3195b144415c4552578658
parentf94d9bdfebf800c66da5032f3a1d5e0d13d528ac (diff)
downloadlapack-efbb122bafe7854fcae4275f6fea3cfac0327485.zip
lapack-efbb122bafe7854fcae4275f6fea3cfac0327485.tar.gz
lapack-efbb122bafe7854fcae4275f6fea3cfac0327485.tar.bz2
Move CMake files to a subdirectory
-rw-r--r--CMAKE/CheckTimeFunction.cmake (renamed from CheckTimeFunction.cmake)4
-rw-r--r--CMAKE/lapack-config-build.cmake.in (renamed from lapack-config.cmake.in)0
-rw-r--r--CMAKE/lapack-config-install.cmake.in (renamed from lapack-config-install.cmake.in)0
-rw-r--r--CMAKE/lapack-config-version.cmake.in (renamed from lapack-config-version.cmake.in)0
-rw-r--r--CMakeLists.txt8
5 files changed, 5 insertions, 7 deletions
diff --git a/CheckTimeFunction.cmake b/CMAKE/CheckTimeFunction.cmake
index 55016b9..350a591 100644
--- a/CheckTimeFunction.cmake
+++ b/CMAKE/CheckTimeFunction.cmake
@@ -16,11 +16,11 @@ macro(CHECK_TIME_FUNCTION FUNCTION VARIABLE)
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
+ 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
+ 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.cmake.in b/CMAKE/lapack-config-build.cmake.in
index 8d60cc8..8d60cc8 100644
--- a/lapack-config.cmake.in
+++ b/CMAKE/lapack-config-build.cmake.in
diff --git a/lapack-config-install.cmake.in b/CMAKE/lapack-config-install.cmake.in
index 0c55fc1..0c55fc1 100644
--- a/lapack-config-install.cmake.in
+++ b/CMAKE/lapack-config-install.cmake.in
diff --git a/lapack-config-version.cmake.in b/CMAKE/lapack-config-version.cmake.in
index 2caeb4a..2caeb4a 100644
--- a/lapack-config-version.cmake.in
+++ b/CMAKE/lapack-config-version.cmake.in
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