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 1766 by gezelter, Thu Jul 5 17:08:25 2012 UTC vs.
Revision 1767 by gezelter, Fri Jul 6 22:01:58 2012 UTC

# Line 8 | Line 8 | endif()
8    set(CMAKE_BUILD_TYPE "Release")
9   endif()
10  
11 + IF(WIN32)
12 +   ADD_DEFINITIONS(/D _CRT_SECURE_NO_WARNINGS)
13 + ENDIF(WIN32)
14 +
15   find_package(MPI)
16   if (NOT MPI_CXX_FOUND)
17   message(STATUS "========== OpenMD Parallel Information ==========")
# Line 262 | Line 266 | src/io/Globals.cpp
266   src/io/ForceFieldOptions.cpp
267   src/io/GayBerneAtomTypesSectionParser.cpp
268   src/io/Globals.cpp
265 src/io/gzstream.cpp
269   src/io/InversionTypesSectionParser.cpp
270   src/io/LennardJonesAtomTypesSectionParser.cpp
271   src/io/MultipoleAtomTypesSectionParser.cpp
# Line 413 | Line 416 | src/optimization/Problem.cpp
416   src/utils/ProgressBar.cpp
417   src/utils/simError.cpp
418   src/optimization/Problem.cpp
419 + )
420 +
421 + IF(ZLIB_FOUND)
422 + set(ZLIB_SOURCE
423 + src/io/gzstream.cpp
424   )
425 + ENDIF(ZLIB_FOUND)
426  
427   IF(QHULL_FOUND)
428   set(QHULL_SOURCE
# Line 427 | Line 436 | ENDIF(QHULL_FOUND)
436   )
437   ENDIF(QHULL_FOUND)
438  
439 < add_library(openmd_core STATIC ${SOURCE} ${QHULL_SOURCE} )
439 > IF(WIN32)
440 > set(GETOPT_SOURCE
441 > src/utils/getopt.cpp
442 > )
443 > ENDIF(WIN32)
444 >
445 > add_library(openmd_core STATIC ${SOURCE} ${QHULL_SOURCE} ${ZLIB_SOURCE} )
446   add_library(openmd_single STATIC ${PARALLEL_SOURCE} ${QHULL_PARALLEL_SOURCE} )
447  
448   IF(MPI_FOUND)
# Line 556 | Line 571 | src/applications/thermalizer/thermalizerCmd.cpp
571   src/applications/thermalizer/thermalizerCmd.cpp
572   )
573  
574 < add_executable(Dump2XYZ ${DUMP2XYZSOURCE})
574 > add_executable(Dump2XYZ ${DUMP2XYZSOURCE} ${GETOPT_SOURCE})
575   target_link_libraries(Dump2XYZ openmd_single openmd_core openmd_single openmd_core)
576 < add_executable(DynamicProps ${DYNAMICPROPSSOURCE})
576 > add_executable(DynamicProps ${DYNAMICPROPSSOURCE} ${GETOPT_SOURCE})
577   target_link_libraries(DynamicProps openmd_single openmd_core openmd_single openmd_core)
578 < add_executable(Hydro ${HYDROSOURCE})
578 > add_executable(Hydro ${HYDROSOURCE} ${GETOPT_SOURCE})
579   target_link_libraries(Hydro openmd_single openmd_core openmd_single openmd_core)
580 < add_executable(StaticProps ${STATICPROPSSOURCE})
580 > add_executable(StaticProps ${STATICPROPSSOURCE} ${GETOPT_SOURCE})
581   target_link_libraries(StaticProps openmd_single openmd_core openmd_single openmd_core)
582 < add_executable(nanoparticleBuilder ${NANOPARTICLEBUILDERSOURCE})
582 > add_executable(nanoparticleBuilder ${NANOPARTICLEBUILDERSOURCE} ${GETOPT_SOURCE})
583   target_link_libraries(nanoparticleBuilder openmd_single openmd_core openmd_single openmd_core)
584 < add_executable(nanorodBuilder ${NANORODBUILDERSOURCE})
584 > add_executable(nanorodBuilder ${NANORODBUILDERSOURCE} ${GETOPT_SOURCE})
585   target_link_libraries(nanorodBuilder openmd_single openmd_core openmd_single openmd_core)
586 < add_executable(nanorod_pentBuilder ${NANOROD_PENTBUILDERSOURCE})
586 > add_executable(nanorod_pentBuilder ${NANOROD_PENTBUILDERSOURCE} ${GETOPT_SOURCE})
587   target_link_libraries(nanorod_pentBuilder openmd_single openmd_core openmd_single openmd_core)
588 < add_executable(randomBuilder ${RANDOMBUILDERSOURCE})
588 > add_executable(randomBuilder ${RANDOMBUILDERSOURCE} ${GETOPT_SOURCE})
589   target_link_libraries(randomBuilder openmd_single openmd_core openmd_single openmd_core)
590 < add_executable(simpleBuilder ${SIMPLEBUILDERSOURCE})
590 > add_executable(simpleBuilder ${SIMPLEBUILDERSOURCE} ${GETOPT_SOURCE})
591   target_link_libraries(simpleBuilder openmd_single openmd_core openmd_single openmd_core)
592 < add_executable(thermalizer ${THERMALIZERSOURCE})
592 > add_executable(thermalizer ${THERMALIZERSOURCE} ${GETOPT_SOURCE})
593   target_link_libraries(thermalizer openmd_single openmd_core openmd_single openmd_core)
594  
595   if (OPENBABEL2_FOUND)
# Line 582 | Line 597 | src/applications/atom2md/openmdformat.cpp
597   src/applications/atom2md/atom2md.cpp
598   src/applications/atom2md/openmdformat.cpp
599   )
600 <  add_executable(atom2md ${ATOM2MDSOURCE})
600 >  add_executable(atom2md ${ATOM2MDSOURCE} ${GETOPT_SOURCE})
601    target_link_libraries(atom2md openmd_single openmd_core openmd_single openmd_core ${OPENBABEL2_LIBRARIES})
602    INSTALL(TARGETS atom2md RUNTIME DESTINATION bin
603            PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines