ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/CMakeLists.txt
(Generate patch)

Comparing branches/development/CMakeLists.txt (file contents):
Revision 1639 by gezelter, Sat Sep 24 20:18:07 2011 UTC vs.
Revision 1763 by gezelter, Sat Jun 30 01:23:41 2012 UTC

# Line 1 | Line 1
1   # Top level cmake script for OpenMD.
2 + project(OpenMD CXX)
3 + cmake_minimum_required(VERSION 2.8.5)
4  
5 < cmake_minimum_required (VERSION 2.6)
4 < project(OpenMD)
5 > SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules")
6  
7 + if (NOT CMAKE_BUILD_TYPE)
8 +  set(CMAKE_BUILD_TYPE "Release")
9 + endif()
10  
11 + find_package(MPI)
12 + if (NOT MPI_CXX_FOUND)
13 + message(STATUS "========== OpenMD Parallel Information ==========")
14 + message(STATUS )
15 + message(STATUS "No MPI compiler found. Perhaps you want to set one explicitly?")
16 + message(STATUS "To override the default compiler, set the environment variable")
17 + message(STATUS "     export CXX=/full/path/to/mpic++")
18 + message(STATUS "in bash or ksh or sh.  In csh or tcsh, use:")
19 + message(STATUS "     setenv CXX /full/path/to/mpic++")
20 + message(STATUS "before running the cmake command.")
21 + message(STATUS )
22 + message(STATUS "=================================================")
23 + endif()
24 + IF ( MPI_CXX_FOUND )
25 +  INCLUDE_DIRECTORIES(${MPI_CXX_INCLUDE_PATH})
26 + ENDIF()
27 +
28 + include(CheckCXXCompilerFlag)
29 + include(CheckIncludeFileCXX)
30 + include(CheckCXXSymbolExists)
31 +
32   # OpenMD version number.
33   set (VERSION_MAJOR "2")
34   set (VERSION_MINOR "0")
35   set (VERSION_TINY "0")  
36 + option(SINGLE_PRECISION "Build Single precision (float) version" OFF)
37  
38 < # cmake modules that are needed to build oopse
39 < SET(CMAKE_MODULE_PATH ${OpenMD_SOURCE_DIR}/cmake/modules)
40 < SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
41 < SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
38 > IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
39 >  SET(CMAKE_INSTALL_PREFIX
40 >    "/usr/local/openmd" CACHE PATH "OpenMD install prefix" FORCE
41 >    )
42 > ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
43  
44 < enable_language(CXX  C)
44 > # ---------- Setup output Directories -------------------------
45 > SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY
46 >  ${PROJECT_BINARY_DIR}/lib
47 >  CACHE PATH
48 >  "Single directory for all shared libraries"
49 >  )
50 > # --------- Setup the Executable output Directory -------------
51 > SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY
52 >  ${PROJECT_BINARY_DIR}/bin
53 >  CACHE PATH
54 >  "Single directory for all Executables."
55 >  )
56 > # --------- Setup the static library directory -------------
57 > SET (CMAKE_ARCHIVE_OUTPUT_DIRECTORY
58 >  ${PROJECT_BINARY_DIR}/lib
59 >  CACHE PATH
60 >  "Single directory for all static libraries."
61 >  )
62  
19 – if ( APPLE )
20 – set(MPI_COMPILER /opt/local/lib/openmpi/bin/mpic++)
21 – set(MPI_LIBRARY "MPI_LIBRARY-NOTFOUND" )
22 – endif( APPLE )
23 – FIND_PACKAGE(MPI)
24 – IF ( MPI_FOUND )
25 –  SET(CMAKE_REQUIRED_INCLUDES "${MPI_INCLUDE_PATH};${CMAKE_REQUIRED_INCLUDES}")
26 –  INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
27 – ENDIF()
28 –
63   FIND_PACKAGE(Subversion)
64   IF ( Subversion_FOUND AND EXISTS ${PROJECT_SOURCE_DIR}/.svn )
65    Subversion_WC_INFO(${PROJECT_SOURCE_DIR} Project)
66 <  MESSAGE("Current revision is ${Project_WC_REVISION}")
66 >  MESSAGE(STATUS "Current revision is ${Project_WC_REVISION}")
67    Subversion_WC_LOG(${PROJECT_SOURCE_DIR} Project)
68    SET(SVN_REV ${Project_WC_REVISION})
69    ADD_DEFINITIONS( -DSVN_REV=${Project_WC_REVISION} )
70 +  SET(GENERATELOGS "${PROJECT_SOURCE_DIR}/doc/svn2cl")
71 +  ADD_CUSTOM_TARGET(ChangeLog
72 +     COMMAND ${GENERATELOGS} "--group-by-day" "--include-rev"
73 +     "--linelen=78" "--output=${PROJECT_BINARY_DIR}/ChangeLog" "${PROJECT_SOURCE_DIR}"
74 +  )
75   ENDIF()
76  
77 + check_include_file_cxx(conio.h      HAVE_CONIO_H)
78 + check_cxx_symbol_exists(strncasecmp   "string.h"   HAVE_STRNCASECMP)
79 +
80   # Optional libraries: If we can find these, we will build with them
81   # Look for OpenBabel libraries
82   find_package(OpenBabel2)
83   IF(OPENBABEL2_FOUND)
84    SET(USE_OPENBABEL)
85    include_directories(${OPENBABEL2_INCLUDE_DIR})
86 <  message(STATUS "Openbabel libs: " ${OPENBABEL2_LIBRARIES})
87 < #  TARGET_LINK_LIBRARIES(${OPENBABEL2_LIBRARIES})
86 >  # link libraries are added only for targets that need them.
87 > ELSE(OPENBABEL2_FOUND)
88 >  MESSAGE(STATUS "No OpenBabel found - will not build atom2md")
89   ENDIF(OPENBABEL2_FOUND)
90  
91 + find_package(Eigen3)
92 + if(EIGEN3_FOUND)
93 +  add_definitions(-DHAVE_EIGEN -DHAVE_EIGEN3)
94 +  include_directories(${EIGEN3_INCLUDE_DIR})
95 + else()
96 +  find_package(Eigen2) # find and setup Eigen2
97 +  if(EIGEN2_FOUND)
98 +    add_definitions (-DHAVE_EIGEN)
99 +    include_directories(${EIGEN2_INCLUDE_DIR})
100 +  endif()
101 + endif()
102 +
103   #Look for QHULL Libraries
104 < find_package(QHULL)
104 > set(QHULL_USE_STATIC 1)
105 > find_package(Qhull)
106   IF(QHULL_FOUND)
107    SET(HAVE_QHULL 1)
108    include_directories(${QHULL_INCLUDE_DIR})
109    LINK_LIBRARIES(${QHULL_LIBRARIES})
110 + ELSE(QHULL_FOUND)
111 +  MESSAGE(STATUS "No Qhull found - will be missing some features")
112   ENDIF(QHULL_FOUND)
113  
56 –
114   # zlib stuff
115   find_package(ZLIB)
116   if(ZLIB_FOUND)
# Line 61 | Line 118 | if(ZLIB_FOUND)
118    add_definitions(-DHAVE_LIBZ)
119    include_directories(${ZLIB_INCLUDE_DIR})
120    LINK_LIBRARIES(${ZLIB_LIBRARIES})
121 + ELSE(ZLIB_FOUND)
122 +  MESSAGE(STATUS "No zlib found - will be missing compressed dump files")
123   endif(ZLIB_FOUND)
124  
125 < #FFTW
126 < INCLUDE(${CMAKE_MODULE_PATH}/FindFFTW.cmake)
127 < IF(FFTW_FOUND)
125 > #FFTW3
126 > IF(SINGLE_PRECISION)
127 >  find_package(FFTW3 COMPONENTS single)
128 > else()
129 >  find_package(FFTW3 COMPONENTS double)
130 > endif(SINGLE_PRECISION)
131 > if (FFTW3_FOUND)
132 >  include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${FFTW3_INCLUDE_DIR})
133    SET(HAVE_LIBFFTW 1)
134 <  SET(HAVE_FFTW3_H)
135 <  INCLUDE_DIRECTORIES(${FFTW_INCLUDE_DIR})
136 <  LINK_LIBRARIES(${FFTW_LIBRARIES})
137 < ENDIF(FFTW_FOUND)
134 >  SET(HAVE_FFTW3_H 1)
135 >  INCLUDE_DIRECTORIES(${FFTW3_INCLUDE_DIR})
136 >  LINK_LIBRARIES(${FFTW3_LIBRARIES})
137 > ELSE(FFTW3_FOUND)
138 >  MESSAGE(STATUS "No fftw3 found - will be missing some analysis modules")
139 > endif (FFTW3_FOUND)
140  
141  
142 < #include checks
143 < include(CheckIncludeFile)
144 < CHECK_INCLUDE_FILE(fftw3.h HAVE_FFTW3_H)
145 < CHECK_INCLUDE_FILE(fftw.h HAVE_FFWT_H)
146 < CHECK_INCLUDE_FILE(dfftw.h HAVE_DFFTW_H)
147 < CHECK_INCLUDE_FILE(cmath.h HAVE_CMATH_H)
148 < check_include_file(limits.h HAVE_LIMITS_H)
149 < check_include_file(stdlib.h HAVE_STDLIB_H)
150 < check_include_file(string.h HAVE_STRING_H)
151 < check_include_file("sys/ioctl.h" HAVE_SYS_IOCTL_H)
86 < check_include_file(unistd.h HAVE_UNISTD_H)
142 > # add a target to generate API documentation with Doxygen
143 > find_package(Doxygen)
144 > if(DOXYGEN_FOUND)
145 >  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/doc/Doxyfile.in" "${CMAKE_CURRENT_BINARY_DIR}/doc/Doxyfile" @ONLY)
146 >  add_custom_target(doc
147 >    ${DOXYGEN_EXECUTABLE} "${CMAKE_CURRENT_BINARY_DIR}/doc/Doxyfile"
148 >    WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/doc"
149 >    COMMENT "Generating API documentation with Doxygen" VERBATIM
150 >  )
151 > endif(DOXYGEN_FOUND)
152  
88 – #symbol checks
89 – include(CheckSymbolExists)
90 –
91 – #function checks
92 – include(CheckFunctionExists)
93 – check_function_exists(atexit HAVE_ATEXIT)
94 – check_function_exists(floor HAVE_FLOOR)
95 – check_function_exists(pow HAVE_POW)
96 – check_function_exists(select HAVE_SELECT)
97 – check_function_exists(sqrt HAVE_SQRT)
98 – check_function_exists(strcasecmp HAVE_STRCASECMP)
99 – check_function_exists(strchr HAVE_STRCHR)
100 – check_function_exists(strdup HAVE_STRDUP)
101 – check_function_exists(strncasecmp HAVE_STRNCASECMP)
102 – check_function_exists(strstr HAVE_STRSTR)
103 – check_function_exists(strtol HAVE_STRTOL)
104 – check_function_exists(strtoull HAVE_STRTOULL)
105 – check_function_exists(sysmp HAVE_SYSMP)
106 – check_function_exists(table HAVE_TABLE)
107 –
108 –
153   FIND_PACKAGE(Perl)
154   IF(PERL_FOUND)
155    SET(PERL ${PERL_EXECUTABLE})
156   ELSE(PERL_FOUND)
157 <  MESSAGE(STATUS "Failed to find perl")
157 >  MESSAGE(STATUS "Failed to find perl - some scripts will not be made")
158   ENDIF(PERL_FOUND)
159  
160 + SET(PERL_INSTALLDIRS "site" CACHE STRING "Perl installation
161 + locations")
162 +
163   FIND_PACKAGE(PythonInterp)
164   IF(PYTHON_EXECUTABLE)
165    SET(PYTHON ${PYTHON_EXECUTABLE})
166   ELSE(PYTHON_EXECUTABLE)
167 <  MESSAGE(STATUS "Failed to find python")
167 >  MESSAGE(STATUS "Failed to find python - some scripts will not be made")
168   ENDIF(PYTHON_EXECUTABLE)
169  
123 – SET(PERL_INSTALLDIRS "site" CACHE STRING "Perl installation locations")
124 –
125 –
126 – include(CMakePrintSystemInformation)
127 –
170   configure_file (
171    "${PROJECT_SOURCE_DIR}/src/config.h.cmake"
172 <  "${PROJECT_SOURCE_DIR}/src/config.h"
173 <  )
174 < include_directories (${PROJECT_SOURCE_DIR}/src)
172 >  "${PROJECT_BINARY_DIR}/config.h"
173 > )
174 > include_directories("${PROJECT_BINARY_DIR}" "${PROJECT_SOURCE_DIR}/src")
175  
134 – #CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
135 –
136 –
176   #Add executables for build
177   set (PROGRAMS
178   openmd
# Line 180 | Line 219 | src/brains/DataStorage.cpp
219   src/antlr/TreeParser.cpp
220   src/brains/BlockSnapshotManager.cpp
221   src/brains/DataStorage.cpp
222 + src/brains/ForceField.cpp
223   src/brains/MoleculeCreator.cpp
224   src/brains/PairList.cpp
225   src/brains/Register.cpp
226   src/brains/SimSnapshotManager.cpp
227   src/brains/Snapshot.cpp
228   src/brains/Stats.cpp
229 + src/constraints/Shake.cpp
230   src/constraints/Rattle.cpp
231   src/hydrodynamics/Ellipsoid.cpp
232   src/hydrodynamics/HydroProp.cpp
233   src/hydrodynamics/Sphere.cpp
234   src/integrators/DLM.cpp
235 + src/flucq/FluctuatingChargeParameters.cpp
236 + src/flucq/FluctuatingChargeNVT.cpp
237 + src/flucq/FluctuatingChargePropagator.cpp
238   src/integrators/Integrator.cpp
239   src/integrators/IntegratorFactory.cpp
240   src/integrators/LangevinDynamics.cpp
# Line 213 | Line 257 | src/io/EAMAtomTypesSectionParser.cpp
257   src/io/ChargeAtomTypesSectionParser.cpp
258   src/io/DirectionalAtomTypesSectionParser.cpp
259   src/io/EAMAtomTypesSectionParser.cpp
260 + src/io/FluctuatingChargeAtomTypesSectionParser.cpp
261   src/io/ForceFieldOptions.cpp
262   src/io/GayBerneAtomTypesSectionParser.cpp
263   src/io/Globals.cpp
# Line 223 | Line 268 | src/io/ParamConstraint.cpp
268   src/io/NonBondedInteractionsSectionParser.cpp
269   src/io/OptionSectionParser.cpp
270   src/io/ParamConstraint.cpp
271 + src/io/PolarizableAtomTypesSectionParser.cpp
272   src/io/SCAtomTypesSectionParser.cpp
273   src/io/SectionParser.cpp
274   src/io/SectionParserManager.cpp
# Line 249 | Line 295 | src/mdParser/MDTreeParser.cpp
295   src/mdParser/MDLexer.cpp
296   src/mdParser/MDParser.cpp
297   src/mdParser/MDTreeParser.cpp
298 < src/minimizers/MinimizerFactory.cpp
299 < src/minimizers/MinimizerParameterSet.cpp
298 > src/optimization/OptimizationFactory.cpp
299 > src/optimization/Armijo.cpp
300 > src/optimization/BFGS.cpp
301 > src/optimization/ConjugateGradient.cpp
302 > src/optimization/Constraint.cpp
303 > src/optimization/EndCriteria.cpp
304 > src/optimization/LineSearch.cpp
305 > src/optimization/LineSearchBasedMethod.cpp
306 > src/optimization/SteepestDescent.cpp
307 > src/optimization/PotentialEnergyObjectiveFunction.cpp
308 > src/optimization/MinimizerParameters.cpp
309   src/nonbonded/EAM.cpp
310   src/nonbonded/Electrostatic.cpp
311   src/nonbonded/GB.cpp
# Line 291 | Line 346 | src/types/CutoffGroupStamp.cpp
346   src/types/CharmmTorsionType.cpp
347   src/types/Component.cpp
348   src/types/CutoffGroupStamp.cpp
349 < src/types/DirectionalAtomType.cpp
349 > src/types/DirectionalAdapter.cpp
350 > src/types/EAMAdapter.cpp
351 > src/types/FixedChargeAdapter.cpp
352 > src/types/FluctuatingChargeAdapter.cpp
353   src/types/FragmentStamp.cpp
354 + src/types/GayBerneAdapter.cpp
355   src/types/ImproperCosineInversionType.cpp
356   src/types/InversionStamp.cpp
357 + src/types/LennardJonesAdapter.cpp
358   src/types/MoleculeStamp.cpp
359 + src/types/MultipoleAdapter.cpp
360   src/types/NonBondedInteractionType.cpp
361 + src/types/PolarizableAdapter.cpp
362   src/types/RestraintStamp.cpp
363   src/types/RigidBodyStamp.cpp
364   src/types/ShapeAtomType.cpp
365 + src/types/StickyAdapter.cpp
366 + src/types/SuttonChenAdapter.cpp
367   src/types/TorsionStamp.cpp
368   src/types/ZconsStamp.cpp
305 – src/UseTheForce/Amber_FF.cpp
306 – src/UseTheForce/CLAYFF.cpp
307 – src/UseTheForce/DUFF.cpp
308 – src/UseTheForce/EADM_FF.cpp
309 – src/UseTheForce/EAM_FF.cpp
310 – src/UseTheForce/ForceField.cpp
311 – src/UseTheForce/ForceFieldFactory.cpp
312 – src/UseTheForce/MnM_FF.cpp
313 – src/UseTheForce/SC_FF.cpp
314 – src/UseTheForce/SHAPES_FF.cpp
369   src/utils/ElementsTable.cpp
370   src/utils/MoLocator.cpp
371   src/utils/OpenMDBitSet.cpp
# Line 329 | Line 383 | src/visitors/ZconsVisitor.cpp
383   src/visitors/ReplacementVisitor.cpp
384   src/visitors/RigidBodyVisitor.cpp
385   src/visitors/ZconsVisitor.cpp
386 + src/rnemd/RNEMDParameters.cpp
387   )
388  
389   set( PARALLEL_SOURCE
# Line 337 | Line 392 | src/constraints/ZconstraintForceManager.cpp
392   src/brains/SimInfo.cpp
393   src/brains/Thermo.cpp
394   src/constraints/ZconstraintForceManager.cpp
395 < src/integrators/RNEMD.cpp
395 > src/flucq/FluctuatingChargeConstraints.cpp
396 > src/flucq/FluctuatingChargeObjectiveFunction.cpp
397 > src/integrators/LangevinHullForceManager.cpp
398 > src/rnemd/RNEMD.cpp
399   src/integrators/Velocitizer.cpp
400   src/io/DumpReader.cpp
401   src/io/DumpWriter.cpp
# Line 347 | Line 405 | src/math/ParallelRandNumGen.cpp
405   src/io/ZConsWriter.cpp
406   src/io/ifstrstream.cpp
407   src/math/ParallelRandNumGen.cpp
350 – src/minimizers/CGFamilyMinimizer.cpp
351 – src/minimizers/Minimizer.cpp
352 – src/minimizers/PRCG.cpp
353 – src/minimizers/SDMinimizer.cpp
408   src/parallel/ForceDecomposition.cpp
409   src/parallel/ForceMatrixDecomposition.cpp
410   src/restraints/RestraintForceManager.cpp
411   src/restraints/ThermoIntegrationForceManager.cpp
412   src/utils/ProgressBar.cpp
413 < src/utils/simError.c
413 > src/utils/simError.cpp
414 > src/optimization/Problem.cpp
415   )
416  
417   IF(QHULL_FOUND)
# Line 390 | Line 445 | target_link_libraries(openmd_MPI openmd_parallel openm
445   COMPILE_DEFINITIONS IS_MPI
446   )
447   target_link_libraries(openmd_MPI openmd_parallel openmd_core openmd_parallel openmd_core)
448 +  INSTALL(TARGETS
449 +        openmd_parallel openmd_MPI
450 +  RUNTIME DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
451 +  LIBRARY DESTINATION lib PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
452 +  ARCHIVE DESTINATION lib PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
453 + )
454   ENDIF (MPI_FOUND)
455  
456   set (DUMP2XYZSOURCE
457   src/applications/dump2Xyz/Dump2XYZ.cpp
458 < src/applications/dump2Xyz/Dump2XYZCmd.c
458 > src/applications/dump2Xyz/Dump2XYZCmd.cpp
459   )
460  
461   set (DYNAMICPROPSSOURCE
# Line 415 | Line 476 | src/applications/dynamicProps/VCorrFunc.cpp
476   src/applications/dynamicProps/ThetaCorrFunc.cpp
477   src/applications/dynamicProps/TimeCorrFunc.cpp
478   src/applications/dynamicProps/VCorrFunc.cpp
479 < src/applications/dynamicProps/DynamicPropsCmd.c
479 > src/applications/dynamicProps/DynamicPropsCmd.cpp
480   )
481  
482   set (HYDROSOURCE
# Line 428 | Line 489 | src/applications/hydrodynamics/ShapeBuilder.cpp
489   src/applications/hydrodynamics/HydrodynamicsModelFactory.cpp
490   src/applications/hydrodynamics/RoughShell.cpp
491   src/applications/hydrodynamics/ShapeBuilder.cpp
492 < src/applications/hydrodynamics/HydroCmd.c
492 > src/applications/hydrodynamics/HydroCmd.cpp
493   )
494  
495   set (STATICPROPSSOURCE
# Line 456 | Line 517 | src/applications/staticProps/TetrahedralityParam.cpp
517   src/applications/staticProps/SCDOrderParameter.cpp
518   src/applications/staticProps/StaticProps.cpp
519   src/applications/staticProps/TetrahedralityParam.cpp
520 + src/applications/staticProps/TetrahedralityParamZ.cpp
521   src/applications/staticProps/TwoDGofR.cpp
522 < src/applications/staticProps/StaticPropsCmd.c
522 > src/applications/staticProps/StaticPropsCmd.cpp
523   )
524  
525   set (NANOPARTICLEBUILDERSOURCE
526   src/applications/nanoparticleBuilder/nanoparticleBuilder.cpp
527   src/applications/nanoparticleBuilder/shapedLatticeSpherical.cpp
528 < src/applications/nanoparticleBuilder/nanoparticleBuilderCmd.c
528 > src/applications/nanoparticleBuilder/nanoparticleBuilderCmd.cpp
529   )
530  
531 + set (NANORODBUILDERSOURCE
532 + src/applications/nanoparticleBuilder/nanorodBuilder.cpp
533 + src/applications/nanoparticleBuilder/shapedLatticeRod.cpp
534 + src/applications/nanoparticleBuilder/nanorodBuilderCmd.cpp
535 + )
536 +
537 + set (NANOROD_PENTBUILDERSOURCE
538 + src/applications/nanoparticleBuilder/nanorod_pentBuilder.cpp
539 + src/applications/nanoparticleBuilder/nanorod_pentBuilderCmd.cpp
540 + src/applications/nanoparticleBuilder/shapedLatticePentRod.cpp
541 + )
542 +
543   set (RANDOMBUILDERSOURCE
544   src/applications/randomBuilder/randomBuilder.cpp
545 < src/applications/randomBuilder/randomBuilderCmd.c
545 > src/applications/randomBuilder/randomBuilderCmd.cpp
546   )
547  
548   set(SIMPLEBUILDERSOURCE
549   src/applications/simpleBuilder/simpleBuilder.cpp
550 < src/applications/simpleBuilder/simpleBuilderCmd.c
550 > src/applications/simpleBuilder/simpleBuilderCmd.cpp
551   )
552  
553   set(THERMALIZERSOURCE
554   src/applications/thermalizer/thermalizer.cpp
555 < src/applications/thermalizer/thermalizerCmd.c
555 > src/applications/thermalizer/thermalizerCmd.cpp
556   )
557  
558   add_executable(Dump2XYZ ${DUMP2XYZSOURCE})
# Line 491 | Line 565 | target_link_libraries(nanoparticleBuilder openmd_singl
565   target_link_libraries(StaticProps openmd_single openmd_core openmd_single openmd_core)
566   add_executable(nanoparticleBuilder ${NANOPARTICLEBUILDERSOURCE})
567   target_link_libraries(nanoparticleBuilder openmd_single openmd_core openmd_single openmd_core)
568 + add_executable(nanorodBuilder ${NANORODBUILDERSOURCE})
569 + target_link_libraries(nanorodBuilder openmd_single openmd_core openmd_single openmd_core)
570 + add_executable(nanorod_pentBuilder ${NANOROD_PENTBUILDERSOURCE})
571 + target_link_libraries(nanorod_pentBuilder openmd_single openmd_core openmd_single openmd_core)
572   add_executable(randomBuilder ${RANDOMBUILDERSOURCE})
573   target_link_libraries(randomBuilder openmd_single openmd_core openmd_single openmd_core)
574   add_executable(simpleBuilder ${SIMPLEBUILDERSOURCE})
# Line 505 | Line 583 | src/applications/atom2md/openmdformat.cpp
583   )
584    add_executable(atom2md ${ATOM2MDSOURCE})
585    target_link_libraries(atom2md openmd_single openmd_core openmd_single openmd_core ${OPENBABEL2_LIBRARIES})
586 +  INSTALL(TARGETS atom2md RUNTIME DESTINATION bin
587 +          PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
588   ENDIF (OPENBABEL2_FOUND)
589  
590  
# Line 518 | Line 598 | src/applications/utilities/waterRotator
598   src/applications/utilities/principalAxisCalculator
599   src/applications/utilities/stat2visco
600   src/applications/utilities/waterRotator
601 + src/applications/utilities/waterReplacer
602   )
603  
604   IF(PYTHON_EXECUTABLE)
605     foreach(PY_FILE ${PY_FILES})
606 <      configure_file(${PY_FILE} "${EXECUTABLE_OUTPUT_PATH}"/${PY_FILE} @ONLY)
606 >      GET_FILENAME_COMPONENT(filename "${PY_FILE}" NAME)
607 >      CONFIGURE_FILE(${PY_FILE}
608 >                     "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${filename}" @ONLY)
609 >      INSTALL(FILES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${filename}"
610 >              DESTINATION bin
611 >              PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
612     endforeach(PY_FILE)
527 – #INSTALL(FILES ${PY_FILES} DESTINATION ${EXECUTABLE_OUTPUT_PATH})
613   ENDIF(PYTHON_EXECUTABLE)
614  
615   set(PERL_FILES
# Line 534 | Line 619 | IF(PERL_FOUND)
619  
620   IF(PERL_FOUND)
621     foreach(PERL_FILE ${PERL_FILES})
622 <      configure_file(${PERL_FILE} "${EXECUTABLE_OUTPUT_PATH}"/${PERL_FILE} @ONLY)
622 >      GET_FILENAME_COMPONENT(filename "${PERL_FILE}" NAME)
623 >      configure_file(${PERL_FILE} "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${filename}" @ONLY)
624 >      INSTALL(FILES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${filename}"
625 >              DESTINATION bin
626 >              PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
627 >
628     endforeach(PERL_FILE)
539 – #INSTALL(FILES ${PERL_FILES} DESTINATION ${EXECUTABLE_OUTPUT_PATH})
629   ENDIF(PERL_FOUND)
630 +
631 + INSTALL(FILES AUTHORS LICENSE README INSTALL DESTINATION .
632 +        PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
633 + INSTALL(TARGETS
634 +        openmd_core
635 +        openmd_single
636 +        openmd
637 +        Dump2XYZ
638 +        simpleBuilder
639 +        StaticProps
640 +        DynamicProps
641 +        randomBuilder
642 +        nanoparticleBuilder
643 +        thermalizer
644 +        Hydro
645 +  RUNTIME DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
646 +  LIBRARY DESTINATION lib PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
647 +  ARCHIVE DESTINATION lib PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
648 + )
649 +
650 + install(DIRECTORY forceFields/  
651 +        DESTINATION forceFields
652 +        DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
653 +        PATTERN ".svn" EXCLUDE
654 +        PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
655 + install(DIRECTORY samples/      
656 +        DESTINATION samples
657 +        DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
658 +        PATTERN ".svn" EXCLUDE
659 +        PATTERN "*.dump" EXCLUDE
660 +        PATTERN "*.stat" EXCLUDE
661 +        PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
662 + INSTALL(FILES "${CMAKE_CURRENT_SOURCE_DIR}/doc/OpenMDmanual.pdf"
663 +        DESTINATION doc
664 +        PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
665 +
666 + message( STATUS)
667 + message( STATUS "========== OpenMD Build Information ==========")
668 + message( STATUS "Current revision ........... = ${SVN_REV}")
669 + message( STATUS "CMAKE_SYSTEM ............... = ${CMAKE_SYSTEM}")
670 + message( STATUS "==============================================")
671 + message( STATUS "CMAKE_BUILD_TYPE ........... = ${CMAKE_BUILD_TYPE}")
672 + message( STATUS "CMAKE_INSTALL_PREFIX ....... = ${CMAKE_INSTALL_PREFIX}")
673 + message( STATUS "Build as SINGLE_PRECISION .. = ${SINGLE_PRECISION}")
674 + message( STATUS "CMAKE_CXX_COMPILER ......... = ${CMAKE_CXX_COMPILER}")
675 + message( STATUS "MPI_CXX_COMPILER ........... = ${MPI_CXX_COMPILER}")
676 + message( STATUS "MPI_CXX_INCLUDE_PATH ....... = ${MPI_CXX_INCLUDE_PATH}")
677 + message( STATUS "MPI_CXX_LIBRARIES .......... = ${MPI_CXX_LIBRARIES}")
678 + message( STATUS "OPENBABEL2_ROOT ............ = ${OPENBABEL2_ROOT}")
679 + message( STATUS "OPENBABEL2_INCLUDE_DIR ..... = ${OPENBABEL2_INCLUDE_DIR}")
680 + message( STATUS "OPENBABEL2_LIBRARIES ....... = ${OPENBABEL2_LIBRARIES}")
681 + message( STATUS "QHULL_ROOT ................. = ${QHULL_ROOT}")
682 + message( STATUS "QHULL_INCLUDE_DIR .......... = ${QHULL_INCLUDE_DIR}")
683 + message( STATUS "QHULL_LIBRARIES ............ = ${QHULL_LIBRARIES}")
684 + message( STATUS "ZLIB_ROOT .................. = ${ZLIB_ROOT}")
685 + message( STATUS "ZLIB_INCLUDE_DIR ........... = ${ZLIB_INCLUDE_DIR}")
686 + message( STATUS "ZLIB_LIBRARIES ............. = ${ZLIB_LIBRARIES}")
687 + message( STATUS "FFTW3_ROOT ................. = ${FFTW3_ROOT}")
688 + message( STATUS "FFTW3_INCLUDE_DIR .......... = ${FFTW3_INCLUDE_DIR}")
689 + message( STATUS "FFTW3_LIBRARIES ............ = ${FFTW3_LIBRARIES}")
690 + message( STATUS "PERL_EXECUTABLE ............ = ${PERL_EXECUTABLE}")
691 + message( STATUS "PYTHON_EXECUTABLE .......... = ${PYTHON_EXECUTABLE}")
692 + message( STATUS "DOXYGEN_EXECUTABLE ......... = ${DOXYGEN_EXECUTABLE}")
693 + message( STATUS )
694 + message( STATUS "To override these options, add -D{OPTION_NAME}=... to the cmake command" )
695 + message( STATUS "Particularly useful defines are for:")
696 + message( STATUS )
697 + message( STATUS "  -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} (where OpenMD will be installed)")
698 + message( STATUS "       -DOPENBABEL2_ROOT=/path/to/openbabel")
699 + message( STATUS "            -DQHULL_ROOT=/path/to/qhull")
700 + message( STATUS "            -DFFTW3_ROOT=/path/to/fftw3")
701 + message( STATUS )
702 + message( STATUS "To build and install OpenMD, enter \"make\" and \"make install\"")
703 + message( STATUS )

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines