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

Comparing trunk/CMakeLists.txt (file contents):
Revision 1794 by gezelter, Thu Aug 30 17:18:22 2012 UTC vs.
Revision 1795 by gezelter, Fri Sep 7 18:13:55 2012 UTC

# Line 444 | Line 444 | set(GETOPT_SOURCE
444  
445   IF(WIN32)
446   set(GETOPT_SOURCE
447 < src/utils/getopt.cpp
447 > src/utils/wingetopt.cpp
448   )
449   ENDIF(WIN32)
450  
# Line 618 | Line 618 | src/applications/utilities/principalAxisCalculator
618   src/applications/utilities/md2md
619   src/applications/utilities/mdSplit
620   src/applications/utilities/principalAxisCalculator
621 + src/applications/utilities/stat2thcond
622   src/applications/utilities/stat2visco
623   src/applications/utilities/waterRotator
624   src/applications/utilities/waterReplacer
625   )
626  
627   IF(PYTHON_EXECUTABLE)
628 <   foreach(PY_FILE ${PY_FILES})
629 <      GET_FILENAME_COMPONENT(filename "${PY_FILE}" NAME)
630 <      CONFIGURE_FILE(${PY_FILE}
631 <                     "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${filename}" @ONLY)
632 <      INSTALL(FILES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${filename}"
633 <              DESTINATION bin
634 <              PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
635 <   endforeach(PY_FILE)
628 >  IF(WIN32)
629 >    SET(PYEXT ".py")
630 >  ELSE(WIN32)
631 >    SET(PYEXT "")
632 >  ENDIF(WIN32)
633 >
634 >  foreach(PY_FILE ${PY_FILES})
635 >    GET_FILENAME_COMPONENT(filename "${PY_FILE}" NAME)
636 >    CONFIGURE_FILE(${PY_FILE}
637 >                  "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${filename}${PYEXT}" @ONLY)
638 >    INSTALL(FILES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${filename}${PYEXT}"
639 >            DESTINATION bin
640 >            PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
641 >  endforeach(PY_FILE)
642   ENDIF(PYTHON_EXECUTABLE)
643  
644   set(PERL_FILES
# Line 640 | Line 647 | IF(PERL_FOUND)
647   )
648  
649   IF(PERL_FOUND)
650 <   foreach(PERL_FILE ${PERL_FILES})
651 <      GET_FILENAME_COMPONENT(filename "${PERL_FILE}" NAME)
652 <      configure_file(${PERL_FILE} "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${filename}" @ONLY)
653 <      INSTALL(FILES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${filename}"
654 <              DESTINATION bin
648 <              PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
650 >  IF(WIN32)
651 >    SET(PLEXT ".PL")
652 >  ELSE(WIN32)
653 >    SET(PLEXT "")
654 >  ENDIF(WIN32)
655  
656 <   endforeach(PERL_FILE)
656 >  foreach(PERL_FILE ${PERL_FILES})
657 >     GET_FILENAME_COMPONENT(filename "${PERL_FILE}" NAME)
658 >     configure_file(${PERL_FILE} "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${filename}${PLEXT}" @ONLY)
659 >     INSTALL(FILES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${filename}${PLEXT}"
660 >             DESTINATION bin
661 >             PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
662 >
663 >  endforeach(PERL_FILE)
664   ENDIF(PERL_FOUND)
665  
666   INSTALL(FILES AUTHORS LICENSE README INSTALL DESTINATION .
# Line 680 | Line 693 | install(DIRECTORY samples/      
693          PATTERN ".svn" EXCLUDE
694          PATTERN "*.dump" EXCLUDE
695          PATTERN "*.stat" EXCLUDE
696 +        PATTERN "*.eor" EXCLUDE
697 +        PATTERN "*.rnemd" EXCLUDE
698          PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
699   INSTALL(FILES "${CMAKE_CURRENT_SOURCE_DIR}/doc/OpenMDmanual.pdf"
700          DESTINATION doc
# Line 730 | Line 745 | message( STATUS )
745    message( STATUS "To build and install OpenMD, enter \"make\" and \"make install\"")
746   ENDIF(WIN32)
747   message( STATUS )
748 +
749 + # build a CPack driven installer package
750 + IF(NOT DEFINED CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS)
751 +   SET(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS ON)
752 + ENDIF()
753 + include (InstallRequiredSystemLibraries)
754 + set (CPACK_RESOURCE_FILE_LICENSE  
755 +     "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
756 + set (CPACK_PACKAGE_VERSION_MAJOR "${VERSION_MAJOR}")
757 + set (CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}")
758 + include (CPack)

Diff Legend

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