XClib test compilation fixes

XClib/CMakeLists.txt

@@ -29,23 +29,25 @@ qe_add_library(qe_xclib ${sources_xclib})
 target_link_libraries(qe_xclib
     PRIVATE
         qe_openmp_fortran
-        qe_mpi_fortran)
+        qe_mpi_fortran
+        qe_lapack)
 
 qe_install_targets(qe_xclib)
 
 ###########################################################
 # xclib_test.x
 ###########################################################
-#if(QE_ENABLE_TEST)
-#    qe_add_executable(qe_xclib_test xclib_test.f90)
-#    set_target_properties(qe_xclib_test 
-#        PROPERTIES 
-#            OUTPUT_NAME qe_xclib_test.x 
-#            RUNTIME_OUTPUT_DIRECTORY ${QE_TESTS_DIR})
-#    target_link_libraries(qe_xclib_test
-#        PRIVATE
-#            qe_openmp_fortran
-#            qe_mpi_fortran
-#            qe_xclib)
-#    add_test(NAME test_qe_xclib COMMAND ${QE_TESTS_DIR}/qe_xclib_test.x)
-#endif(QE_ENABLE_TEST)
+if(QE_ENABLE_TEST)
+    qe_add_executable(qe_xclib_test xclib_test.f90)
+    set_target_properties(qe_xclib_test 
+        PROPERTIES 
+            OUTPUT_NAME qe_xclib_test.x 
+            RUNTIME_OUTPUT_DIRECTORY ${QE_TESTS_DIR})
+    target_link_libraries(qe_xclib_test
+        PRIVATE
+            qe_openmp_fortran
+            qe_mpi_fortran
+            qe_lapack
+            qe_xclib)
+    add_test(NAME test_qe_xclib COMMAND ${QE_TESTS_DIR}/qe_xclib_test.x)
+endif(QE_ENABLE_TEST)

XClib/Makefile

@@ -31,7 +31,7 @@ BEEF = \
 pbecor.o \
 beefun.o
 
-all: xc_lib.a xclib_test.x
+all: xc_lib.a
 
 xc_lib.a: $(XCL) $(BEEF)
 	$(AR) $(ARFLAGS) $@ $?
@@ -42,6 +42,8 @@ xclib_test.x : xclib_test.o xc_lib.a
 		xclib_test.o xc_lib.a $(BLAS_LIBS) $(LD_LIBS) $(LIBXC_LIBS)
 	- ( cd ../bin ; ln -fs ../XClib/$@ . )
 
+test : xclib_test.x
+
 clean :
 	- /bin/rm -f *.o *.a *.d *.i *~ *_tmp.f90 *.mod *.L *.x