Added binary and data install targets for cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 43942e32079c0e234f902b64da2b9179dbaed596..ae73463a6e5f325d07bc625b2c93ae89edd52d8c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -338,7 +338,9 @@ set(MAN_INSTALL_DIR  ${CMAKE_INSTALL_PREFIX}/share/man)
 
 set(GMXLIBDIR        ${DATA_INSTALL_DIR}/top)
 
-add_subdirectory(src)
+
 add_subdirectory(share)
 add_subdirectory(include)
 add_subdirectory(man)
+
+add_subdirectory(src)

diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
new file mode 100644 (file)
index 0000000..4d9ed46
--- /dev/null
+++ b/include/CMakeLists.txt
@@ -0,0 +1,10 @@
+# includes: Nothing to build, just installation
+install(DIRECTORY . DESTINATION include/gromacs
+  PATTERN "Makefile*" EXCLUDE
+  PATTERN ".svn" EXCLUDE
+  PATTERN "CVS" EXCLUDE
+  PATTERN "CMake*" EXCLUDE
+  PATTERN "cmake*" EXCLUDE
+  PATTERN ".cvsignore" EXCLUDE
+  PATTERN "*~" EXCLUDE
+)

diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt
new file mode 100644 (file)
index 0000000..8d12c44
--- /dev/null
+++ b/man/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Man pages: Nothing to build, just installation
+install(DIRECTORY . DESTINATION ${MAN_INSTALL_DIR}
+  PATTERN "Makefile*" EXCLUDE
+  PATTERN ".svn" EXCLUDE
+  PATTERN "CVS" EXCLUDE
+  PATTERN ".cvsignore" EXCLUDE
+  PATTERN "CMake*" EXCLUDE
+  PATTERN "cmake*" EXCLUDE
+  PATTERN "*~" EXCLUDE
+)

diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt
new file mode 100644 (file)
index 0000000..8003ebc
--- /dev/null
+++ b/share/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Data: Nothing to build, just installation
+install(DIRECTORY . DESTINATION ${DATA_INSTALL_DIR}
+  PATTERN "Makefile*" EXCLUDE
+  PATTERN ".svn" EXCLUDE
+  PATTERN "CVS" EXCLUDE
+  PATTERN ".cvsignore" EXCLUDE
+  PATTERN "CMake*" EXCLUDE
+  PATTERN "cmake*" EXCLUDE
+  PATTERN "*~" EXCLUDE
+)

diff --git a/src/gmxlib/CMakeLists.txt b/src/gmxlib/CMakeLists.txt
index b28f31d70daba77ef5565148e023563286a6094e..1a148dc5f5cb4b3084b8f462c83c7eb721b76ac3 100644 (file)
--- a/src/gmxlib/CMakeLists.txt
+++ b/src/gmxlib/CMakeLists.txt
@@ -3,4 +3,5 @@ file(GLOB GMXLIB_SOURCES *.c gmx_blas/*.c gmx_lapack/*.c gmx_statistics/*.c nonb
 
 add_library(gmx ${GMXLIB_SOURCES})
 
+install(TARGETS gmx DESTINATION ${LIB_INSTALL_DIR})
 

diff --git a/src/kernel/CMakeLists.txt b/src/kernel/CMakeLists.txt
index 1470797f3862294ba6022efc7c17fd2cad044e7b..e6dab20151a0868b45dc18376124d0df367af32e 100644 (file)
--- a/src/kernel/CMakeLists.txt
+++ b/src/kernel/CMakeLists.txt
@@ -69,6 +69,10 @@ add_executable(mdrun ${MDRUN_SOURCES})
 target_link_libraries(mdrun md ${GMX_EXTRA_LIBRARIES})
 
 
+install(TARGETS 
+        grompp tpbconv pdb2gmx protonate luck gmxdump
+        x2top gmxcheck mdrun
+        RUNTIME DESTINATION ${BIN_INSTALL_DIR})
 
 
 if(GMX_FAHCORE)

diff --git a/src/mdlib/CMakeLists.txt b/src/mdlib/CMakeLists.txt
index 758b4ec58940e1564faf5634e2b3c82fa2edbebf..b283845dd182c67751b237382c774ba815098232 100644 (file)
--- a/src/mdlib/CMakeLists.txt
+++ b/src/mdlib/CMakeLists.txt
@@ -5,4 +5,5 @@ add_library(md ${MDLIB_SOURCES})
 
 target_link_libraries(md gmx)
 
+install(TARGETS md DESTINATION ${LIB_INSTALL_DIR})
 

diff --git a/src/ngmx/CMakeLists.txt b/src/ngmx/CMakeLists.txt
index c1abfc28d28a2b6a1f30980ae266425704776713..23a4a28ba8e66f3d1ae7092e24c1e35912081f8a 100644 (file)
--- a/src/ngmx/CMakeLists.txt
+++ b/src/ngmx/CMakeLists.txt
@@ -34,4 +34,8 @@ target_link_libraries(scrollw md ${X11_LIBRARIES} ${GROMACS_EXTRA_LIBRARIES})
 add_executable(showcol showcol.c ${NGMX_COMMON_SOURCE})
 target_link_libraries(showcol md ${X11_LIBRARIES} ${GROMACS_EXTRA_LIBRARIES})
 
+install(TARGETS
+       ngmx xrama highway gmxlogo dlg scrollw showcol
+       RUNTIME DESTINATION ${BIN_INSTALL_DIR})
+
 endif(X11_FOUND)

diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
index 0258a0388298165d68da5fc0171448bd4c650949..68974c6f21c7c4af2e533d247b9e29368024ad25 100644 (file)
--- a/src/tools/CMakeLists.txt
+++ b/src/tools/CMakeLists.txt
@@ -262,3 +262,29 @@ add_executable(sigeps sigeps.c)
 target_link_libraries(sigeps gmxana)
 
 
+install(TARGETS
+        do_dssp         editconf        eneconv         
+        genbox          genconf         genrestr        g_nmtraj        
+        make_ndx        mk_angndx       trjcat          trjconv         
+        trjorder        wheel           xpm2ps          genion          
+        anadock         make_edi        
+        g_analyze       g_anaeig        g_angle         g_bond          
+        g_bundle        g_chi           g_cluster       g_confrms       
+        g_covar         g_current       
+        g_density       g_densmap       g_dih           
+        g_dielectric    g_helixorient   g_principal 
+        g_dipoles       g_disre         g_dist          g_dyndom        
+        g_enemat        g_energy        g_lie           g_filter        
+        g_gyrate        g_h2order       g_hbond         g_helix         
+        g_mindist       g_msd           g_morph         g_nmeig         
+        g_nmens         g_order         
+        g_polystat      g_potential     g_rama          
+        g_rdf           g_rms           g_rmsdist       g_rmsf          
+        g_rotacf        g_saltbr        g_sas           g_sgangle       
+        g_sham          g_sorient       g_spol          
+        g_sdf           g_spatial       
+        g_tcaf          g_traj          g_tune_pme   
+        g_vanhove       g_velacc        
+        g_clustsize     g_mdmat         g_wham          g_kinetics      
+        sigeps
+       RUNTIME        DESTINATION ${BIN_INSTALL_DIR})