Updated CMakeLists and FindGLUT.cmake.

gregorpm · Nov 28, 2014 · 99faa74 · 99faa74
1 parent a8429bd
commit 99faa74
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,6 +7,10 @@ set(BIN_INSTALL_DIR "bin")
 set(LIB_INSTALL_DIR "lib")
 set(INCLUDE_INSTALL_DIR "include/${PROJECT_NAME}")
 
+if(WIN32)
+  set(CUDA_ATTACH_VS_BUILD_RULE_TO_CUDA_FILE OFF)
+endif()
+
 if(UNIX)
   set(BUILD_SHARED_LIBS true)
 endif()

diff --git a/cmake/modules/FindGLUT.cmake b/cmake/modules/FindGLUT.cmake
@@ -76,11 +76,23 @@ if (GLUT_FOUND)
   # If not, we need some way to figure out what platform we are on.
   set( GLUT_LIBRARIES
     ${GLUT_glut_LIBRARY}
-    ${GLUT_Xmu_LIBRARY}
-    ${GLUT_Xi_LIBRARY}
     ${GLUT_cocoa_LIBRARY}
     )
 
+  if (GLUT_Xmu_LIBRARY)
+    set( GLUT_LIBRARIES
+      ${GLUT_LIBRARIES}
+      ${GLUT_Xmu_LIBRARY}
+      )
+  endif()
+
+  if (GLUT_Xi_LIBRARY)
+    set( GLUT_LIBRARIES
+      ${GLUT_LIBRARIES}
+      ${GLUT_Xi_LIBRARY}
+      )
+  endif()
+
   #The following deprecated settings are for backwards compatibility with CMake1.4
   set (GLUT_LIBRARY ${GLUT_LIBRARIES})
   set (GLUT_INCLUDE_PATH ${GLUT_INCLUDE_DIR})