Commit 169ce872 authored by Chris Cantwell's avatar Chris Cantwell

Cleaned up CMake file.

Updated search paths and library name for FFTW.
parent 14772f58
......@@ -5,9 +5,10 @@ SET(FFTW_SEARCH_PATHS
${CMAKE_SOURCE_DIR}/../ThirdParty/fftw-3.2.2/
${CMAKE_SOURCE_DIR}/../ThirdParty/fftw-3.2.2/lib/
${CMAKE_SOURCE_DIR}/ThirdParty/build/dist/lib
${CMAKE_SOURCE_DIR}/../ThirdParty/build/dist/lib )
${CMAKE_SOURCE_DIR}/../ThirdParty/build/dist/lib
$ENV{LD_LIBRARY_PATH} $ENV{FFTW_HOME}/lib )
FIND_LIBRARY(FFTW_LIB NAMES fftw3 PATHS ${FFTW_SEARCH_PATHS} ENV LD_LIBRARY_PATH)
FIND_LIBRARY(FFTW_LIB NAMES fftw3 fftw3f PATHS ${FFTW_SEARCH_PATHS})
SET(FFTW_FOUND FALSE)
IF (FFTW_LIB)
......
......@@ -174,10 +174,6 @@ MACRO(ADD_NEKTAR_EXECUTABLE name component sources)
PROPERTIES COMPILE_FLAGS "${THE_COMPILE_FLAGS} ${MPI_COMPILE_FLAGS}")
SET_TARGET_PROPERTIES(${name}
PROPERTIES LINK_FLAGS "${THE_LINK_FLAGS} ${MPI_LINK_FLAGS}")
#SET_PROPERTY(TARGET ${name}
# APPEND PROPERTY COMPILE_FLAGS "${MPI_COMPILE_FLAGS}")
#SET_PROPERTY(TARGET ${name}
# APPEND PROPERTY LINK_FLAGS "${MPI_LINK_FLAGS}")
ENDIF( NEKTAR_USE_MPI )
IF( ${CMAKE_SYSTEM} MATCHES "Linux.*" )
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment