Added additional support for x64 projects on Windows.

Author: gregorpm

CMakeLists.txt

@@ -33,7 +33,7 @@ find_package(GLEW REQUIRED)
 # GLFW
 find_package(GLFW REQUIRED)
 # HDF5
-find_package(HDF5 REQUIRED)
+find_package(HDF5 REQUIRED NO_MODULE)
 # OpenCV
 find_package(OpenCV REQUIRED)
 # OpenGL

applications/camera_capture/install.cmake

@@ -8,7 +8,11 @@ copy_file("szip.dll" "${HDF5_INCLUDE_DIR}/../bin")
 copy_file("zlib.dll" "${HDF5_INCLUDE_DIR}/../bin")
 
 # Copy and Install GLEW DLLs
-copy_file("glew32.dll" "${GLEW_INCLUDE_DIRS}/../bin/Release/Win32")
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+  copy_file("glew32.dll" "${GLEW_INCLUDE_DIRS}/../bin/Release/x64")
+else()
+  copy_file("glew32.dll" "${GLEW_INCLUDE_DIRS}/../bin/Release/Win32")
+endif()
 
 # Copy and Install OpenNI2 DLLs
 copy_file("OpenNI2.dll" "${OPENNI2_INCLUDE_DIRS}/../Redist")

applications/camera_viewer/install.cmake

@@ -8,7 +8,11 @@ copy_file("szip.dll" "${HDF5_INCLUDE_DIR}/../bin")
 copy_file("zlib.dll" "${HDF5_INCLUDE_DIR}/../bin")
 
 # Copy and Install GLEW DLLs
-copy_file("glew32.dll" "${GLEW_INCLUDE_DIRS}/../bin/Release/Win32")
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+  copy_file("glew32.dll" "${GLEW_INCLUDE_DIRS}/../bin/Release/x64")
+else()
+  copy_file("glew32.dll" "${GLEW_INCLUDE_DIRS}/../bin/Release/Win32")
+endif()
 
 # Copy and Install OpenNI2 DLLs
 copy_file("OpenNI2.dll" "${OPENNI2_INCLUDE_DIRS}/../Redist")

applications/copy_file.cmake

@@ -1,13 +1,5 @@
 function(copy_file filename directory)
-  # Clear file location.
-  set(file_location "file_location-NOTFOUND")
-
-  # Find file.
-  find_file(file_location
-    NAMES ${filename}
-    PATHS ${directory}
-    PATH_SUFFIXES "Release" "Debug"
-  )
+  set(file_location ${directory}/${filename})
 
   # Copy file to working directory.
   add_custom_command(TARGET ${APPICATION_NAME} POST_BUILD COMMAND

applications/face_detection/install.cmake

@@ -8,7 +8,11 @@ copy_file("szip.dll" "${HDF5_INCLUDE_DIR}/../bin")
 copy_file("zlib.dll" "${HDF5_INCLUDE_DIR}/../bin")
 
 # Copy and Install GLEW DLLs
-copy_file("glew32.dll" "${GLEW_INCLUDE_DIRS}/../bin/Release/Win32")
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+  copy_file("glew32.dll" "${GLEW_INCLUDE_DIRS}/../bin/Release/x64")
+else()
+  copy_file("glew32.dll" "${GLEW_INCLUDE_DIRS}/../bin/Release/Win32")
+endif()
 
 # Copy and Install OpenNI2 DLLs
 copy_file("OpenNI2.dll" "${OPENNI2_INCLUDE_DIRS}/../Redist")
@@ -18,11 +22,22 @@ copy_folder("OpenNI2" "${OPENNI2_INCLUDE_DIRS}/../Redist")
 set(OpenCV_NUMBER
     "${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}")
 
-copy_file("opencv_core${OpenCV_NUMBER}.dll" "${OpenCV_DIR}/bin")
-copy_file("opencv_core${OpenCV_NUMBER}d.dll" "${OpenCV_DIR}/bin")
-copy_file("opencv_highgui${OpenCV_NUMBER}.dll" "${OpenCV_DIR}/bin")
-copy_file("opencv_highgui${OpenCV_NUMBER}d.dll" "${OpenCV_DIR}/bin")
-copy_file("opencv_imgproc${OpenCV_NUMBER}.dll" "${OpenCV_DIR}/bin")
-copy_file("opencv_imgproc${OpenCV_NUMBER}d.dll" "${OpenCV_DIR}/bin")
-copy_file("opencv_objdetect${OpenCV_NUMBER}.dll" "${OpenCV_DIR}/bin")
-copy_file("opencv_objdetect${OpenCV_NUMBER}d.dll" "${OpenCV_DIR}/bin")
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+  copy_file("opencv_core${OpenCV_NUMBER}.dll" "${OpenCV_DIR}/x64/vc11/bin")
+  copy_file("opencv_core${OpenCV_NUMBER}d.dll" "${OpenCV_DIR}/x64/vc11/bin")
+  copy_file("opencv_highgui${OpenCV_NUMBER}.dll" "${OpenCV_DIR}/x64/vc11/bin")
+  copy_file("opencv_highgui${OpenCV_NUMBER}d.dll" "${OpenCV_DIR}/x64/vc11/bin")
+  copy_file("opencv_imgproc${OpenCV_NUMBER}.dll" "${OpenCV_DIR}/x64/vc11/bin")
+  copy_file("opencv_imgproc${OpenCV_NUMBER}d.dll" "${OpenCV_DIR}/x64/vc11/bin")
+  copy_file("opencv_objdetect${OpenCV_NUMBER}.dll" "${OpenCV_DIR}/x64/vc11/bin")
+  copy_file("opencv_objdetect${OpenCV_NUMBER}d.dll" "${OpenCV_DIR}/x64/vc11/bin")
+else()
+  copy_file("opencv_core${OpenCV_NUMBER}.dll" "${OpenCV_DIR}/x86/vc11/bin")
+  copy_file("opencv_core${OpenCV_NUMBER}d.dll" "${OpenCV_DIR}/x86/vc11/bin")
+  copy_file("opencv_highgui${OpenCV_NUMBER}.dll" "${OpenCV_DIR}/x86/vc11/bin")
+  copy_file("opencv_highgui${OpenCV_NUMBER}d.dll" "${OpenCV_DIR}/x86/vc11/bin")
+  copy_file("opencv_imgproc${OpenCV_NUMBER}.dll" "${OpenCV_DIR}/x86/vc11/bin")
+  copy_file("opencv_imgproc${OpenCV_NUMBER}d.dll" "${OpenCV_DIR}/x86/vc11/bin")
+  copy_file("opencv_objdetect${OpenCV_NUMBER}.dll" "${OpenCV_DIR}/x86/vc11/bin")
+  copy_file("opencv_objdetect${OpenCV_NUMBER}d.dll" "${OpenCV_DIR}/x86/vc11/bin")
+endif()

applications/face_modeling/install.cmake

@@ -8,7 +8,11 @@ copy_file("szip.dll" "${HDF5_INCLUDE_DIR}/../bin")
 copy_file("zlib.dll" "${HDF5_INCLUDE_DIR}/../bin")
 
 # Copy and Install GLEW DLLs
-copy_file("glew32.dll" "${GLEW_INCLUDE_DIRS}/../bin/Release/Win32")
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+  copy_file("glew32.dll" "${GLEW_INCLUDE_DIRS}/../bin/Release/x64")
+else()
+  copy_file("glew32.dll" "${GLEW_INCLUDE_DIRS}/../bin/Release/Win32")
+endif()
 
 # Copy and Install OpenNI2 DLLs
 copy_file("OpenNI2.dll" "${OPENNI2_INCLUDE_DIRS}/../Redist")

applications/object_modeling/install.cmake

@@ -8,7 +8,11 @@ copy_file("szip.dll" "${HDF5_INCLUDE_DIR}/../bin")
 copy_file("zlib.dll" "${HDF5_INCLUDE_DIR}/../bin")
 
 # Copy and Install GLEW DLLs
-copy_file("glew32.dll" "${GLEW_INCLUDE_DIRS}/../bin/Release/Win32")
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+  copy_file("glew32.dll" "${GLEW_INCLUDE_DIRS}/../bin/Release/x64")
+else()
+  copy_file("glew32.dll" "${GLEW_INCLUDE_DIRS}/../bin/Release/Win32")
+endif()
 
 # Copy and Install OpenNI2 DLLs
 copy_file("OpenNI2.dll" "${OPENNI2_INCLUDE_DIRS}/../Redist")