fix library dependencies

CMakeLists.txt

@@ -101,6 +101,9 @@ if(ENABLE_MPI)
 endif()
 
 include(RelaxSE_Sources)
+if(ENABLE_DEV)
+  include(RelaxSE_dev)
+endif()
 
 # Common Libraries
 add_library(RelaxSE_common
@@ -155,18 +158,27 @@ add_dependencies(RelaxSE_lib RelaxSE_IO)
 add_dependencies(RelaxSE_lib RelaxSE_common)
 
 if(ENABLE_DEV)
-add_library(RelaxSE_prop
-  ${RELAXSE_SOURCES_prop}
-  ${RELAXSE_dev})
+  add_library(RelaxSE_prop
+    ${RELAXSE_SOURCES_prop}
+    ${RELAXSE_dev})
 else()
-add_library(RelaxSE_prop
-  ${RELAXSE_SOURCES_prop})
+  add_library(RelaxSE_prop
+    ${RELAXSE_SOURCES_prop})
 endif()
-add_dependencies(RelaxSE_prop RelaxSE_type)
-add_dependencies(RelaxSE_prop RelaxSE_IO)
-add_dependencies(RelaxSE_prop RelaxSE_common)
-add_dependencies(RelaxSE_prop RelaxSE_lib)
 
+if (ENABLE_NOGEN)
+  add_dependencies(RelaxSE_prop RelaxSE_type)
+  add_dependencies(RelaxSE_prop RelaxSE_IO)
+  add_dependencies(RelaxSE_prop RelaxSE_common)
+  add_dependencies(RelaxSE_prop RelaxSE_lib)
+else()
+  add_dependencies(RelaxSE_prop RelaxSE_type)
+  add_dependencies(RelaxSE_prop RelaxSE_IO)
+  add_dependencies(RelaxSE_prop RelaxSE_common)
+  add_dependencies(RelaxSE_prop RelaxSE_fockgen)
+  add_dependencies(RelaxSE_prop RelaxSE_intgen)
+  add_dependencies(RelaxSE_prop RelaxSE_lib)
+endif()
 
 if(MPI_Fortran_FOUND)
   target_include_directories(RelaxSE_lib PRIVATE 
@@ -206,13 +218,25 @@ if(ENABLE_NOGEN)
   ### RelaxSE program (nogen)
   add_executable(relaxse.x src/RelaxSE.F90)
   target_link_libraries(relaxse.x
-  RelaxSE_lib
-  RelaxSE_type
-  RelaxSE_IO
-  RelaxSE_common
-  ${LAPACK_LIBRARIES}
-  ${BLAS_LIBRARIES}
-  )
+    RelaxSE_lib
+    RelaxSE_type
+    RelaxSE_IO
+    RelaxSE_common
+    ${LAPACK_LIBRARIES}
+    ${BLAS_LIBRARIES}
+    )
+
+  ### Code for properties calculations
+  add_executable(prop.x src/prop.F90)
+  target_link_libraries(prop.x
+    RelaxSE_lib
+    RelaxSE_prop
+    RelaxSE_type
+    RelaxSE_IO
+    RelaxSE_common
+    ${LAPACK_LIBRARIES}
+    ${BLAS_LIBRARIES}
+    )
 else()
   ### RelaxSE program (gen)
   add_executable(relaxse.x src/RelaxSE.F90)
@@ -226,19 +250,23 @@ else()
     ${LAPACK_LIBRARIES}
     ${BLAS_LIBRARIES}
     )
+
+  ### Code for properties calculations
+  add_executable(prop.x src/prop.F90)
+  target_link_libraries(prop.x
+    RelaxSE_lib
+    RelaxSE_prop
+    RelaxSE_type
+    RelaxSE_IO
+    RelaxSE_common
+    RelaxSE_fockgen
+    RelaxSE_intgen
+    ${LAPACK_LIBRARIES}
+    ${BLAS_LIBRARIES}
+    )
 endif()
 
-### Code for properties calculations
-add_executable(prop.x src/prop.F90)
-target_link_libraries(prop.x
-  RelaxSE_lib
-  RelaxSE_prop
-  RelaxSE_type
-  RelaxSE_IO
-  RelaxSE_common
-  ${LAPACK_LIBRARIES}
-  ${BLAS_LIBRARIES}
-  )
+
 
 ### Unitests
 enable_testing()