corrected order of fftw library linking

amirgholami · Jan 12, 2017 · ae56b40 · ae56b40
1 parent 5d73849
commit ae56b40
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 15 deletions.
diff --git a/steps/step1/CMakeLists.txt b/steps/step1/CMakeLists.txt
@@ -22,10 +22,10 @@ add_executable(step1 ${step1_SRCS})
 target_link_libraries(step1
   accfft
   accfft_utils
-  ${FFTW_LIB}
   ${FFTW_THREADS_LIB}
-  ${FFTWF_LIB}
+  ${FFTW_LIB}
   ${FFTWF_THREADS_LIB}
+  ${FFTWF_LIB}
 )
 if (PNETCDF_FOUND)
   target_link_libraries(step1 ${PNETCDF_LIBRARIES})
@@ -45,10 +45,10 @@ add_executable(step1f ${step1f_SRCS})
 target_link_libraries(step1f
   accfft
   accfft_utils
-  ${FFTW_LIB}
   ${FFTW_THREADS_LIB}
-  ${FFTWF_LIB}
+  ${FFTW_LIB}
   ${FFTWF_THREADS_LIB}
+  ${FFTWF_LIB}
 )
 if (PNETCDF_FOUND)
   target_link_libraries(step1f ${PNETCDF_LIBRARIES})

diff --git a/steps/step2/CMakeLists.txt b/steps/step2/CMakeLists.txt
@@ -21,10 +21,10 @@ add_executable(step2f ${step2f_SRCS})
 target_link_libraries(step2f
   accfft
   accfft_utils
-  ${FFTW_LIB}
   ${FFTW_THREADS_LIB}
-  ${FFTWF_LIB}
+  ${FFTW_LIB}
   ${FFTWF_THREADS_LIB}
+  ${FFTWF_LIB}
 )
 if (PNETCDF_FOUND)
   target_link_libraries(step2f ${PNETCDF_LIBRARIES})
@@ -43,8 +43,10 @@ add_executable(step2 ${step2_SRCS})
 target_link_libraries(step2
   accfft
   accfft_utils
-  ${FFTW_LIB}
   ${FFTW_THREADS_LIB}
+  ${FFTW_LIB}
+  ${FFTWF_THREADS_LIB}
+  ${FFTWF_LIB}
 )
 if (PNETCDF_FOUND)
   target_link_libraries(step2 ${PNETCDF_LIBRARIES})

diff --git a/steps/step3/CMakeLists.txt b/steps/step3/CMakeLists.txt
@@ -20,10 +20,10 @@ add_executable(step3f ${step3f_SRCS})
 target_link_libraries(step3f
   accfft
   accfft_utils
-  ${FFTW_LIB}
   ${FFTW_THREADS_LIB}
-  ${FFTWF_LIB}
+  ${FFTW_LIB}
   ${FFTWF_THREADS_LIB}
+  ${FFTWF_LIB}
 )
 if (PNETCDF_FOUND)
   target_link_libraries(step3f ${PNETCDF_LIBRARIES})
@@ -41,8 +41,10 @@ add_executable(step3 ${step3_SRCS})
 target_link_libraries(step3
   accfft
   accfft_utils
-  ${FFTW_LIB}
   ${FFTW_THREADS_LIB}
+  ${FFTW_LIB}
+  ${FFTWF_THREADS_LIB}
+  ${FFTWF_LIB}
 )
 if (PNETCDF_FOUND)
   target_link_libraries(step3 ${PNETCDF_LIBRARIES})

diff --git a/steps/step4/CMakeLists.txt b/steps/step4/CMakeLists.txt
@@ -20,8 +20,8 @@ add_executable(step4 ${step4_SRCS})
 target_link_libraries(step4
   accfft
   accfft_utils
-  ${FFTW_LIB}
   ${FFTW_THREADS_LIB}
+  ${FFTW_LIB}
 )
 if (PNETCDF_FOUND)
   target_link_libraries(step4 ${PNETCDF_LIBRARIES})

diff --git a/steps/step5/CMakeLists.txt b/steps/step5/CMakeLists.txt
@@ -20,10 +20,10 @@ add_executable(step5f ${step5f_SRCS})
 target_link_libraries(step5f
   accfft
   accfft_utils
-  ${FFTW_LIB}
   ${FFTW_THREADS_LIB}
-  ${FFTWF_LIB}
+  ${FFTW_LIB}
   ${FFTWF_THREADS_LIB}
+  ${FFTWF_LIB}
 )
 if (PNETCDF_FOUND)
   target_link_libraries(step5f ${PNETCDF_LIBRARIES})
@@ -41,8 +41,10 @@ add_executable(step5 ${step5_SRCS})
 target_link_libraries(step5
   accfft
   accfft_utils
-  ${FFTW_LIB}
   ${FFTW_THREADS_LIB}
+  ${FFTW_LIB}
+  ${FFTWF_THREADS_LIB}
+  ${FFTWF_LIB}
 )
 if (PNETCDF_FOUND)
   target_link_libraries(step5 ${PNETCDF_LIBRARIES})

diff --git a/steps/step6/CMakeLists.txt b/steps/step6/CMakeLists.txt
@@ -20,8 +20,10 @@ add_executable(step6 ${step6_SRCS})
 target_link_libraries(step6
   accfft
   accfft_utils
-  ${FFTW_LIB}
   ${FFTW_THREADS_LIB}
+  ${FFTW_LIB}
+  ${FFTWF_THREADS_LIB}
+  ${FFTWF_LIB}
 )
 if (PNETCDF_FOUND)
   target_link_libraries(step6 ${PNETCDF_LIBRARIES})