Changed cmake to choose install directory the same way as in SimTKcommon project

ApiDoxygen.cmake

@@ -12,7 +12,7 @@ ELSE(DOXYGEN_EXECUTABLE-NOTFOUND)
 
     FILE(MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/html/")
     INSTALL(DIRECTORY "${PROJECT_BINARY_DIR}/html/"
-            DESTINATION "openmm/doc/api/"
+            DESTINATION "doc/api/"
             )
 ENDIF(DOXYGEN_EXECUTABLE-NOTFOUND)
 

CMakeLists.txt

@@ -23,6 +23,29 @@ IF( NOT PROJECT_NAME )
     PROJECT (OpenMM)
 ENDIF( NOT PROJECT_NAME )
 
+# Where to install
+IF(${CMAKE_C_COMPILER} MATCHES "gcc")
+    IF(NOT OPENMM_INSTALL_PREFIX)
+        SET(OPENMM_INSTALL_PREFIX "/usr/local/openmm" CACHE PATH "Where to install OpenMM")
+    ENDIF(NOT OPENMM_INSTALL_PREFIX)
+ELSE(${CMAKE_C_COMPILER} MATCHES "gcc")
+    IF(NOT OPENMM_INSTALL_PREFIX)
+        SET(OPENMM_INSTALL_PREFIX "C:/Program Files/OpenMM" CACHE PATH "Where to install OpenMM")
+    ENDIF(NOT OPENMM_INSTALL_PREFIX)
+ENDIF(${CMAKE_C_COMPILER} MATCHES "gcc")
+MARK_AS_ADVANCED(OPENMM_INSTALL_PREFIX)
+
+# It seems that on linux and mac, everything is trying to be installed in /usr/local/openmm
+# But if every install target is prefixed with /openmm/, on Windows the install files
+# end up in C:/Program Files/OpenMM/openmm/ which is ugly.
+# Better to set CMAKE_INSTALL_PREFIX to /usr/local/openmm and leave /openmm/ off the 
+# install target names.  Plus, the user now has the opportunity to install into /usr/local/
+# if she so chooses.  --cmb
+IF(${CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT})
+  SET(CMAKE_INSTALL_PREFIX ${OPENMM_INSTALL_PREFIX} CACHE PATH "Where to install OpenMM" FORCE)
+ENDIF(${CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT})
+
+
 INCLUDE(Dart)
 
 SUBDIRS (platforms/reference/tests platforms/cuda)
@@ -219,12 +242,13 @@ INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/src)
 ADD_LIBRARY(${SHARED_TARGET} SHARED ${SOURCE_FILES} ${SOURCE_INCLUDE_FILES} ${API_ABS_INCLUDE_FILES})
 ADD_LIBRARY(${STATIC_TARGET} STATIC ${SOURCE_FILES} ${SOURCE_INCLUDE_FILES} ${API_ABS_INCLUDE_FILES})
 
-INSTALL_TARGETS(/openmm/lib RUNTIME_DIRECTORY /openmm/lib ${SHARED_TARGET})
-INSTALL_TARGETS(/openmm/lib RUNTIME_DIRECTORY /openmm/lib ${STATIC_TARGET})
+
+INSTALL_TARGETS(/lib RUNTIME_DIRECTORY /lib ${SHARED_TARGET})
+INSTALL_TARGETS(/lib RUNTIME_DIRECTORY /lib ${STATIC_TARGET})
 FILE(GLOB CORE_HEADERS     include/*.h          */include/*.h)
 FILE(GLOB INTERNAL_HEADERS include/internal/*.h */include/internal/*.h)
-INSTALL_FILES(/openmm/include/         FILES ${CORE_HEADERS})
-INSTALL_FILES(/openmm/include/internal FILES ${INTERNAL_HEADERS})
+INSTALL_FILES(/include/         FILES ${CORE_HEADERS})
+INSTALL_FILES(/include/internal FILES ${INTERNAL_HEADERS})
 
 #
 # Allow automated build and dashboard.

platforms/cuda/cuda-cmake/FindCuda.cmake

@@ -104,7 +104,7 @@ INCLUDE(${FINDCUDA_DIR}/CudaDependency.cmake)
 
 # Parse CUDA build type.
 IF (NOT CUDA_BUILD_TYPE)
-  SET(CUDA_BUILD_TYPE "Emulation" CACHE STRING "Cuda build type: Emulation or Device")
+  SET(CUDA_BUILD_TYPE "Device" CACHE STRING "Cuda build type: Emulation or Device")
 ENDIF(NOT CUDA_BUILD_TYPE)
 
 # Emulation if the card isn't present.
@@ -504,4 +504,4 @@ MACRO(CUDA_COMPILE file_variable)
   
   SET(file_variable ${target_srcs} ${cuda_cu_sources})
 
-ENDMACRO(CUDA_COMPILE)
\ No newline at end of file
+ENDMACRO(CUDA_COMPILE)

platforms/cuda/sharedTarget/CMakeLists.txt

@@ -19,4 +19,4 @@ CUDA_ADD_LIBRARY(${SHARED_TARGET} SHARED ${SOURCE_FILES} ${SOURCE_INCLUDE_FILES}
 
 TARGET_LINK_LIBRARIES(${SHARED_TARGET} debug ${OPENMM_LIBRARY_NAME}_d optimized ${OPENMM_LIBRARY_NAME})
 
-INSTALL_TARGETS(/openmm/lib RUNTIME_DIRECTORY /openmm/lib ${SHARED_TARGET})
+INSTALL_TARGETS(/lib RUNTIME_DIRECTORY /lib ${SHARED_TARGET})

platforms/cuda/staticTarget/CMakeLists.txt

@@ -19,4 +19,4 @@ CUDA_ADD_LIBRARY(${STATIC_TARGET} STATIC ${SOURCE_FILES} ${SOURCE_INCLUDE_FILES}
 
 TARGET_LINK_LIBRARIES(${STATIC_TARGET} debug ${OPENMM_LIBRARY_NAME}_static_d optimized ${OPENMM_LIBRARY_NAME}_static)
 
-INSTALL_TARGETS(/openmm/lib RUNTIME_DIRECTORY /openmm/lib ${STATIC_TARGET})
+INSTALL_TARGETS(/lib RUNTIME_DIRECTORY /lib ${STATIC_TARGET})