small cleanups for windows support merge

mp3guy · Oct 18, 2016 · e1032bc · e1032bc
1 parent b46a5ca
commit e1032bc
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/Core/src/CMakeLists.txt b/Core/src/CMakeLists.txt
@@ -29,7 +29,7 @@ if(WIN32)
   file(GLOB containers_hdrs Cuda/containers/*.hpp)
 endif()
 
-set(CUDA_ARCH_BIN "20 30 35 50 52 61" CACHE STRING "Specify "real" GPU arch to build binaries for, BIN(PTX) format is supported. Example: 1.3 2.1(1.3) or 13 21(13)")
+set(CUDA_ARCH_BIN "30 35 50 52 61" CACHE STRING "Specify "real" GPU arch to build binaries for, BIN(PTX) format is supported. Example: 1.3 2.1(1.3) or 13 21(13)")
 set(CUDA_ARCH_PTX "" CACHE STRING "Specify 'virtual' PTX arch to build PTX intermediate code for. Example: 1.0 1.2 or 10 12")              
 
 SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR})
@@ -79,4 +79,4 @@ INSTALL(TARGETS efusion
             RUNTIME DESTINATION bin
             LIBRARY DESTINATION lib
             ARCHIVE DESTINATION lib
-    )
+    )
diff --git a/GUI/src/CMakeLists.txt b/GUI/src/CMakeLists.txt
@@ -4,18 +4,20 @@ project(ElasticFusion)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}")
 
-if (WIN32)
+if(WIN32)
   find_package(JPEG REQUIRED)
 endif()
+
 find_package(ZLIB REQUIRED)
 find_package(Pangolin 0.1 REQUIRED)
 find_package(CUDA REQUIRED)
 find_package(OpenNI2 REQUIRED)
 find_package(efusion REQUIRED)
 
-if (WIN32)
+if(WIN32)
   include_directories(${JPEG_INCLUDE_DIR})
-endif ()
+endif()
+
 include_directories(${ZLIB_INCLUDE_DIR})
 include_directories(${EIGEN_INCLUDE_DIRS})
 include_directories(${Pangolin_INCLUDE_DIRS})
@@ -25,12 +27,12 @@ include_directories(${OPENNI2_INCLUDE_DIR})
 
 file(GLOB srcs *.cpp)
 file(GLOB tools_srcs Tools/*.cpp)
+
 if(WIN32)
   file(GLOB hdrs *.h)
   file(GLOB tools_hdrs Tools/*.h)
 endif()
 
-
 if(WIN32)
   add_definitions(-Dlinux=0)
   add_definitions(-DWIN32_LEAN_AND_MEAN)
@@ -61,7 +63,7 @@ target_link_libraries(ElasticFusion
 )
 
 INSTALL(TARGETS ElasticFusion
-            RUNTIME DESTINATION bin
-            LIBRARY DESTINATION lib
-            ARCHIVE DESTINATION lib
-    )
+        RUNTIME DESTINATION bin
+        LIBRARY DESTINATION lib
+        ARCHIVE DESTINATION lib
+)
diff --git a/GUI/src/Findefusion.cmake b/GUI/src/Findefusion.cmake
@@ -25,4 +25,7 @@ set(EFUSION_LIBRARIES ${EFUSION_LIBRARY})
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(EFUSION DEFAULT_MSG EFUSION_LIBRARY EFUSION_INCLUDE_DIR)
-#mark_as_advanced(EFUSION_LIBRARY EFUSION_INCLUDE_DIR)
+
+if(NOT WIN32)
+  mark_as_advanced(EFUSION_LIBRARY EFUSION_INCLUDE_DIR)
+endif()