X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=source%2Funres%2Fsrc_CSA%2FCMakeLists.txt;h=5b8d334080a880dfd40f86ad8fcbe40ac31e4ca7;hb=011f9a16683bb48096837601ff7136a747e01981;hp=89cb6a18e0a12f574701c6d5dde4a8af61d42d15;hpb=2d2b453b1e7e5b31ab4b56405f35100093e2c6de;p=unres.git

diff --git a/source/unres/src_CSA/CMakeLists.txt b/source/unres/src_CSA/CMakeLists.txt
index 89cb6a1..5b8d334 100644
--- a/source/unres/src_CSA/CMakeLists.txt
+++ b/source/unres/src_CSA/CMakeLists.txt
@@ -119,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_SRC0} PROPERTY COMPILE_FLAGS ${FFLAGS0} )
@@ -177,6 +177,13 @@ 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_PP_SRC} PROPERTY COMPILE_DEFINITIONS ${CPPFLAGS} )  
 
@@ -228,19 +235,24 @@ set(UNRES_CSA_SRCS ${UNRES_CSA_SRC0} ${UNRES_CSA_SRC3} ${CMAKE_CURRENT_BINARY_DI
 #=========================================
 add_executable(UNRES_BIN-CSA ${UNRES_CSA_SRCS} )
 set_target_properties(UNRES_BIN-CSA PROPERTIES OUTPUT_NAME ${UNRES_BIN})
-
-#set_property(TARGET ${UNRES_BIN} PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/unres/MD )
+set_property(TARGET UNRES_BIN-CSA PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin )
 #add_dependencies (${UNRES_BIN} ${UNRES_XDRFLIB})
 
 #=========================================
 # Link libraries
 #=========================================
 # link MPI library (libmpich.a)  
-target_link_libraries( UNRES_BIN-CSA ${MPIF_LIBRARIES} )
+target_link_libraries( UNRES_BIN-CSA ${MPI_Fortran_LIBRARIES} )
 # link libxdrf.a 
 #target_link_libraries( ${UNRES_BIN} xdrf )
 
 #=========================================
+# Install Path
+#=========================================
+install(TARGETS UNRES_BIN-CSA DESTINATION ${CMAKE_INSTALL_PREFIX}/unres/CSA)
+
+
+#=========================================
 # TESTS 
 #=========================================