X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=source%2Funres%2Fsrc_CSA_DiL%2FCMakeLists.txt;h=ae64a42ef4a17a02e3abed13e0d5f2a3032ddaa3;hb=a67fb1c3d80e370d951bfa338356af720229eb6c;hp=66451c115f129b3b04dbac32fb315c6a09f19784;hpb=ffd054c36c10fe2229fd5987ea0ab328ef3bbd3a;p=unres.git

diff --git a/source/unres/src_CSA_DiL/CMakeLists.txt b/source/unres/src_CSA_DiL/CMakeLists.txt
index 66451c1..ae64a42 100644
--- a/source/unres/src_CSA_DiL/CMakeLists.txt
+++ b/source/unres/src_CSA_DiL/CMakeLists.txt
@@ -52,6 +52,7 @@ set(UNRES_CSA_DiL_SRC0
 	ran.f
 	readpdb.F
 	readrtns_csa.F
+	refsys.f
 	rescode.f
 	rmdd.f
 	rmsd.F
@@ -118,10 +119,10 @@ endif (Fortran_COMPILER_NAME STREQUAL "ifort")
 
 # Add MPI compiler flags
 if(UNRES_WITH_MPI)
-  set(FFLAGS0 "${FFLAGS0} -I${MPIF_INCLUDE_DIRECTORIES}")
-  set(FFLAGS1 "${FFLAGS1} -I${MPIF_INCLUDE_DIRECTORIES}")
-  set(FFLAGS2 "${FFLAGS2} -I${MPIF_INCLUDE_DIRECTORIES}")
-  set(FFLAGS3 "${FFLAGS3} -I${MPIF_INCLUDE_DIRECTORIES}")
+  set(FFLAGS0 "${FFLAGS0} -I${MPI_Fortran_INCLUDE_PATH}")
+  set(FFLAGS1 "${FFLAGS1} -I${MPI_Fortran_INCLUDE_PATH}")
+  set(FFLAGS2 "${FFLAGS2} -I${MPI_Fortran_INCLUDE_PATH}")
+  set(FFLAGS3 "${FFLAGS3} -I${MPI_Fortran_INCLUDE_PATH}")
 endif(UNRES_WITH_MPI)
 
 set_property(SOURCE ${UNRES_CSA_DiL_SRC0} PROPERTY COMPILE_FLAGS ${FFLAGS0} )
@@ -176,14 +177,24 @@ endif (Fortran_COMPILER_NAME STREQUAL "ifort")
 #=========================================
 set(CPPFLAGS "${CPPFLAGS} -DMP -DMPI") 
 
+#=========================================
+# add 64-bit specific preprocessor flags
+#=========================================
+if (architektura STREQUAL "64")
+  set(CPPFLAGS "${CPPFLAGS} -DAMD64")
+endif (architektura STREQUAL "64")
+  
+
+#=========================================
 # Apply preprocesor flags to *.F files
+#=========================================
 set_property(SOURCE ${UNRES_CSA_DiL_PP_SRC} PROPERTY COMPILE_DEFINITIONS ${CPPFLAGS} )  
 
 
 #========================================
 #  Setting binary name
 #========================================
-set(UNRES_BIN "unresCSA_${Fortran_COMPILER_NAME}_${UNRES_CSA_FF}_DiL.exe")
+set(UNRES_BIN "unresCSA_DiL_${Fortran_COMPILER_NAME}_${UNRES_CSA_FF}.exe")
 
 #=========================================
 # cinfo.f workaround for CMake
@@ -227,17 +238,19 @@ set(UNRES_CSA_DiL_SRCS ${UNRES_CSA_DiL_SRC0} ${UNRES_CSA_DiL_SRC3} ${CMAKE_CURRE
 #=========================================
 add_executable(UNRES_BIN-CSA-DIL ${UNRES_CSA_DiL_SRCS} )
 set_target_properties(UNRES_BIN-CSA-DIL PROPERTIES OUTPUT_NAME ${UNRES_BIN})
-
-#set_property(TARGET ${UNRES_BIN} PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/unres/MD )
-#add_dependencies (${UNRES_BIN} ${UNRES_XDRFLIB})
+set_property(TARGET UNRES_BIN-CSA-DIL PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin )
 
 #=========================================
 # Link libraries
 #=========================================
-# link MPI library (libmpich.a)  
-target_link_libraries( UNRES_BIN-CSA-DIL ${MPIF_LIBRARIES} )
-# link libxdrf.a 
-#target_link_libraries( ${UNRES_BIN} xdrf )
+# link MPI libraries
+target_link_libraries( UNRES_BIN-CSA-DIL ${MPI_Fortran_LIBRARIES} )
+
+#=========================================
+# Install Path
+#=========================================
+install(TARGETS UNRES_BIN-CSA-DIL DESTINATION ${CMAKE_INSTALL_PREFIX})
+
 
 #=========================================
 # TESTS