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 1652 by gezelter, Tue Sep 27 18:18:28 2011 UTC vs.
Revision 1655 by gezelter, Mon Oct 3 20:32:45 2011 UTC

# Line 161 | Line 161 | configure_file (
161  
162   configure_file (
163    "${PROJECT_SOURCE_DIR}/src/config.h.cmake"
164 <  "${PROJECT_SOURCE_DIR}/src/config.h"
165 <  )
166 < include_directories (${PROJECT_SOURCE_DIR}/src)
167 <
168 < #CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
164 >  "${PROJECT_BINARY_DIR}/config.h"
165 > )
166 > include_directories("${PROJECT_BINARY_DIR}" "${PROJECT_SOURCE_DIR}/src")
167  
168  
169   #Add executables for build
# Line 434 | Line 432 | src/applications/dump2Xyz/Dump2XYZ.cpp
432  
433   set (DUMP2XYZSOURCE
434   src/applications/dump2Xyz/Dump2XYZ.cpp
435 < src/applications/dump2Xyz/Dump2XYZCmd.c
435 > src/applications/dump2Xyz/Dump2XYZCmd.cpp
436   )
437  
438   set (DYNAMICPROPSSOURCE
# Line 455 | Line 453 | src/applications/dynamicProps/VCorrFunc.cpp
453   src/applications/dynamicProps/ThetaCorrFunc.cpp
454   src/applications/dynamicProps/TimeCorrFunc.cpp
455   src/applications/dynamicProps/VCorrFunc.cpp
456 < src/applications/dynamicProps/DynamicPropsCmd.c
456 > src/applications/dynamicProps/DynamicPropsCmd.cpp
457   )
458  
459   set (HYDROSOURCE
# Line 468 | Line 466 | src/applications/hydrodynamics/ShapeBuilder.cpp
466   src/applications/hydrodynamics/HydrodynamicsModelFactory.cpp
467   src/applications/hydrodynamics/RoughShell.cpp
468   src/applications/hydrodynamics/ShapeBuilder.cpp
469 < src/applications/hydrodynamics/HydroCmd.c
469 > src/applications/hydrodynamics/HydroCmd.cpp
470   )
471  
472   set (STATICPROPSSOURCE
# Line 497 | Line 495 | src/applications/staticProps/TwoDGofR.cpp
495   src/applications/staticProps/StaticProps.cpp
496   src/applications/staticProps/TetrahedralityParam.cpp
497   src/applications/staticProps/TwoDGofR.cpp
498 < src/applications/staticProps/StaticPropsCmd.c
498 > src/applications/staticProps/StaticPropsCmd.cpp
499   )
500  
501   set (NANOPARTICLEBUILDERSOURCE
502   src/applications/nanoparticleBuilder/nanoparticleBuilder.cpp
503   src/applications/nanoparticleBuilder/shapedLatticeSpherical.cpp
504 < src/applications/nanoparticleBuilder/nanoparticleBuilderCmd.c
504 > src/applications/nanoparticleBuilder/nanoparticleBuilderCmd.cpp
505   )
506  
507   set (RANDOMBUILDERSOURCE
508   src/applications/randomBuilder/randomBuilder.cpp
509 < src/applications/randomBuilder/randomBuilderCmd.c
509 > src/applications/randomBuilder/randomBuilderCmd.cpp
510   )
511  
512   set(SIMPLEBUILDERSOURCE
513   src/applications/simpleBuilder/simpleBuilder.cpp
514 < src/applications/simpleBuilder/simpleBuilderCmd.c
514 > src/applications/simpleBuilder/simpleBuilderCmd.cpp
515   )
516  
517   set(THERMALIZERSOURCE
518   src/applications/thermalizer/thermalizer.cpp
519 < src/applications/thermalizer/thermalizerCmd.c
519 > src/applications/thermalizer/thermalizerCmd.cpp
520   )
521  
522   add_executable(Dump2XYZ ${DUMP2XYZSOURCE})

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines