Move old cmake files

JuliaLang · May 4, 2012 · 6a1d31b · 6a1d31b
1 parent 06ae5cd
commit 6a1d31b
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/deps/cmake/CMakeLists.txt b/deps/cmake/CMakeLists.txt
@@ -1,3 +1,5 @@
 cmake_minimum_required(VERSION 2.8)
 add_subdirectory(arpack)
-add_subdirectory(fftw-3.3)
+add_subdirectory(fftw-3.3)
+set(FFTW_SINGLE ON)
+add_subdirectory(fftw-3.3 ${CMAKE_CURRENT_BINARY_DIR}/fftw-3.3f)
diff --git a/deps/cmake/arpack/CMakeLists.txt b/deps/cmake/arpack/CMakeLists.txt
@@ -106,5 +106,5 @@ prefixlist(arpackutil_STAT_SRCS "${arpackutil_DIR}")
 
 ########### next target ###############
 add_library(arpack SHARED ${arpacksrc_STAT_SRCS} ${arpackutil_STAT_SRCS})
-target_link_libraries(arpack ${LAPACK_TARGET} ${BLAS_LIBRARIES})
+target_link_libraries(arpack ${LapackLIB} ${BLAS_LIBRARIES})
 set_target_properties(arpack PROPERTIES VERSION 2.0.0 SOVERSION 2)
diff --git a/deps/cmake/fftw-3.3/CMakeLists.txt b/deps/cmake/fftw-3.3/CMakeLists.txt
@@ -172,7 +172,7 @@ if(FFTW_QUAD)
 	set(BENCHFFT_QUAD ON)
 endif()
 
-set(PREC_PREFIX ${PRECISION})
+set(PREC_SUFFIX ${PRECISION})
 if(NOT DEFINED PRECISION)
 	set(PRECISION "d")
 endif()

diff --git a/deps/cmake/fftw-3.3/libbench2/CMakeLists.txt b/deps/cmake/fftw-3.3/libbench2/CMakeLists.txt
@@ -45,7 +45,7 @@ set(SRCDIR ${CMAKE_CURRENT_SOURCE_DIR})
 string(REPLACE "${TOP_CMAKE_SRCDIR}" "" SRCDIR "${SRCDIR}")
 prefixlist(bench2_STAT_SRCS "${TOP_SRCDIR}/${SRCDIR}/")
 
-add_library(bench2 STATIC ${bench2_STAT_SRCS})
+add_library(bench2${PREC_SUFFIX} STATIC ${bench2_STAT_SRCS})
 
 
 ########### install files ###############
diff --git a/deps/fdlibm/CMakeLists.txt b/deps/fdlibm/CMakeLists.txt
@@ -164,4 +164,4 @@ w_sinh.c
 w_sqrt.c
 )
 
-add_library(fdlibm STATIC ${SOURCES})
+add_library(fdlibm STATIC ${SOURCES})