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 1812 by gezelter, Fri Nov 16 21:18:42 2012 UTC vs.
Revision 1830 by gezelter, Wed Jan 9 22:02:30 2013 UTC

# Line 35 | Line 35 | set (VERSION_MAJOR "2")
35  
36   # OpenMD version number.
37   set (VERSION_MAJOR "2")
38 < set (VERSION_MINOR "0")
38 > set (VERSION_MINOR "1")
39   set (VERSION_TINY "0")  
40   option(SINGLE_PRECISION "Build Single precision (float) version" OFF)
41  
42   IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
43 <  SET(CMAKE_INSTALL_PREFIX
44 <    "/usr/local/openmd" CACHE PATH "OpenMD install prefix" FORCE
45 <    )
43 >  IF(WIN32)
44 >    SET(CMAKE_INSTALL_PREFIX "C:/Program Files (x86)/openmd"
45 >        CACHE PATH "OpenMD install prefix" FORCE)
46 >  ELSE(WIN32)
47 >    SET(CMAKE_INSTALL_PREFIX "/usr/local/openmd"
48 >        CACHE PATH "OpenMD install prefix" FORCE)
49 >  ENDIF(WIN32)
50   ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
51 + ADD_DEFINITIONS( -DFRC_PATH=${CMAKE_INSTALL_PREFIX}/forceFields )
52  
53   # ---------- Setup output Directories -------------------------
54   SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY
# Line 744 | Line 749 | message( STATUS )
749   message( STATUS "            -DQHULL_ROOT=/path/to/qhull")
750   message( STATUS "            -DFFTW3_ROOT=/path/to/fftw3")
751   message( STATUS )
752 < message( STATUS "To build and install OpenMD, enter \"make\" and \"make install\"")
752 > IF(WIN32)
753 >  message( STATUS "To build and install OpenMD, enter: ")
754 >  message( STATUS "  msbuild /m ALL_BUILD.vcxproj /p:Configuration=${CMAKE_BUILD_TYPE}")
755 >  message( STATUS "followed by:")
756 >  message( STATUS "  msbuild /m INSTALL.vcxproj /p:Configuration=${CMAKE_BUILD_TYPE}")
757 > ELSE(WIN32)
758 >  message( STATUS "To build and install OpenMD, enter \"make\" and \"make install\"")
759 > ENDIF(WIN32)
760   message( STATUS )
761  
762   # build a CPack driven installer package

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines