Skip to content

Commit 8c22bd5

Browse files
gregorpmgregorpm
committed
Updated CMake install.
1 parent 424e3de commit 8c22bd5

File tree

8 files changed

+72
-77
lines changed

8 files changed

+72
-77
lines changed

‎applications/camera_capture/install.cmake

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
11
include(../copy_file.cmake)
2+
include(../copy_folder.cmake)
23

34
# Copy and Install HDF5 DLLs
4-
copy_file("${HDF5_INCLUDE_DIR}/../bin/hdf5.dll")
5-
copy_file("${HDF5_INCLUDE_DIR}/../bin/hdf5_cpp.dll")
6-
copy_file("${HDF5_INCLUDE_DIR}/../bin/szip.dll")
7-
copy_file("${HDF5_INCLUDE_DIR}/../bin/zlib.dll")
5+
copy_file("hdf5.dll" "${HDF5_INCLUDE_DIR}/../bin")
6+
copy_file("hdf5_cpp.dll" "${HDF5_INCLUDE_DIR}/../bin")
7+
copy_file("szip.dll" "${HDF5_INCLUDE_DIR}/../bin")
8+
copy_file("zlib.dll" "${HDF5_INCLUDE_DIR}/../bin")
89

910
# Copy and Install GLUT DLLs
10-
copy_file("${GLUT_INCLUDE_DIR}/../bin/freeglut.dll")
11+
copy_file("freeglut.dll" "${GLUT_INCLUDE_DIR}/../bin")
1112

1213
# Copy and Install OpenNI2 DLLs
13-
copy_file("${OPENNI2_INCLUDE_DIRS}/../Redist/OpenNI2.dll")
14-
15-
add_custom_command(TARGET ${APPICATION_NAME} POST_BUILD
16-
COMMAND ${CMAKE_COMMAND} -E copy_directory
17-
"${OPENNI2_INCLUDE_DIRS}/../Redist/OpenNI2"
18-
"$<TARGET_FILE_DIR:${APPICATION_NAME}>/OpenNI2")
19-
install(DIRECTORY "${OPENNI2_INCLUDE_DIRS}/../Redist/OpenNI2"
20-
DESTINATION "${BIN_INSTALL_DIR}")
14+
copy_file("OpenNI2.dll" "${OPENNI2_INCLUDE_DIRS}/../Redist")
15+
copy_folder("OpenNI2" "${OPENNI2_INCLUDE_DIRS}/../Redist")

‎applications/camera_viewer/install.cmake

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
11
include(../copy_file.cmake)
2+
include(../copy_folder.cmake)
23

34
# Copy and Install HDF5 DLLs
4-
copy_file("${HDF5_INCLUDE_DIR}/../bin/hdf5.dll")
5-
copy_file("${HDF5_INCLUDE_DIR}/../bin/hdf5_cpp.dll")
6-
copy_file("${HDF5_INCLUDE_DIR}/../bin/szip.dll")
7-
copy_file("${HDF5_INCLUDE_DIR}/../bin/zlib.dll")
5+
copy_file("hdf5.dll" "${HDF5_INCLUDE_DIR}/../bin")
6+
copy_file("hdf5_cpp.dll" "${HDF5_INCLUDE_DIR}/../bin")
7+
copy_file("szip.dll" "${HDF5_INCLUDE_DIR}/../bin")
8+
copy_file("zlib.dll" "${HDF5_INCLUDE_DIR}/../bin")
89

910
# Copy and Install GLUT DLLs
10-
copy_file("${GLUT_INCLUDE_DIR}/../bin/freeglut.dll")
11+
copy_file("freeglut.dll" "${GLUT_INCLUDE_DIR}/../bin")
1112

1213
# Copy and Install OpenNI2 DLLs
13-
copy_file("${OPENNI2_INCLUDE_DIRS}/../Redist/OpenNI2.dll")
14-
15-
add_custom_command(TARGET ${APPICATION_NAME} POST_BUILD
16-
COMMAND ${CMAKE_COMMAND} -E copy_directory
17-
"${OPENNI2_INCLUDE_DIRS}/../Redist/OpenNI2"
18-
"$<TARGET_FILE_DIR:${APPICATION_NAME}>/OpenNI2")
19-
install(DIRECTORY "${OPENNI2_INCLUDE_DIRS}/../Redist/OpenNI2"
20-
DESTINATION "${BIN_INSTALL_DIR}")
14+
copy_file("OpenNI2.dll" "${OPENNI2_INCLUDE_DIRS}/../Redist")
15+
copy_folder("OpenNI2" "${OPENNI2_INCLUDE_DIRS}/../Redist")

‎applications/copy_file.cmake

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,18 @@
1-
function(copy_file path)
1+
function(copy_file filename directory)
2+
# Clear file location.
3+
set(file_location "file_location-NOTFOUND")
4+
5+
# Find file.
6+
find_file(file_location
7+
NAMES ${filename}
8+
PATHS ${directory}
9+
PATH_SUFFIXES "Release" "Debug"
10+
)
11+
212
# Copy file to working directory.
313
add_custom_command(TARGET ${APPICATION_NAME} POST_BUILD COMMAND
4-
${CMAKE_COMMAND} -E copy "${path}"
14+
${CMAKE_COMMAND} -E copy "${file_location}"
515
$<TARGET_FILE_DIR:${APPICATION_NAME}>)
616
# Install file.
7-
install(FILES "${path}" DESTINATION ${BIN_INSTALL_DIR})
17+
install(FILES "${file_location}" DESTINATION ${BIN_INSTALL_DIR})
818
endfunction()

‎applications/copy_folder.cmake

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
function(copy_folder folder_name directory)
2+
add_custom_command(TARGET ${APPICATION_NAME} POST_BUILD
3+
COMMAND ${CMAKE_COMMAND} -E copy_directory
4+
"${directory}/${folder_name}"
5+
"$<TARGET_FILE_DIR:${APPICATION_NAME}>/${folder_name}")
6+
7+
install(DIRECTORY "${directory}/${folder_name}"
8+
DESTINATION "${BIN_INSTALL_DIR}")
9+
endfunction()

‎applications/face_detection/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ target_link_libraries(${APPICATION_NAME} ${LIBS})
4444
install(TARGETS ${APPICATION_NAME} DESTINATION ${BIN_INSTALL_DIR})
4545

4646
include(../copy_file.cmake)
47-
copy_file("${PROJECT_SOURCE_DIR}/data/haarcascade_frontalface_default.xml")
47+
copy_file("haarcascade_frontalface_default.xml" "${PROJECT_SOURCE_DIR}/data")
4848

4949
if(WIN32)
5050
include(install.cmake)

‎applications/face_detection/install.cmake

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,28 @@
11
include(../copy_file.cmake)
2+
include(../copy_folder.cmake)
23

34
# Copy and Install HDF5 DLLs
4-
copy_file("${HDF5_INCLUDE_DIR}/../bin/hdf5.dll")
5-
copy_file("${HDF5_INCLUDE_DIR}/../bin/hdf5_cpp.dll")
6-
copy_file("${HDF5_INCLUDE_DIR}/../bin/szip.dll")
7-
copy_file("${HDF5_INCLUDE_DIR}/../bin/zlib.dll")
5+
copy_file("hdf5.dll" "${HDF5_INCLUDE_DIR}/../bin")
6+
copy_file("hdf5_cpp.dll" "${HDF5_INCLUDE_DIR}/../bin")
7+
copy_file("szip.dll" "${HDF5_INCLUDE_DIR}/../bin")
8+
copy_file("zlib.dll" "${HDF5_INCLUDE_DIR}/../bin")
89

910
# Copy and Install GLUT DLLs
10-
copy_file("${GLUT_INCLUDE_DIR}/../bin/freeglut.dll")
11+
copy_file("freeglut.dll" "${GLUT_INCLUDE_DIR}/../bin")
1112

1213
# Copy and Install OpenNI2 DLLs
13-
copy_file("${OPENNI2_INCLUDE_DIRS}/../Redist/OpenNI2.dll")
14-
15-
add_custom_command(TARGET ${APPICATION_NAME} POST_BUILD
16-
COMMAND ${CMAKE_COMMAND} -E copy_directory
17-
"${OPENNI2_INCLUDE_DIRS}/../Redist/OpenNI2"
18-
"$<TARGET_FILE_DIR:${APPICATION_NAME}>/OpenNI2")
19-
install(DIRECTORY "${OPENNI2_INCLUDE_DIRS}/../Redist/OpenNI2"
20-
DESTINATION "${BIN_INSTALL_DIR}")
14+
copy_file("OpenNI2.dll" "${OPENNI2_INCLUDE_DIRS}/../Redist")
15+
copy_folder("OpenNI2" "${OPENNI2_INCLUDE_DIRS}/../Redist")
2116

2217
# Copy and Install OpenCV DLLs
2318
set(OpenCV_NUMBER
2419
"${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}")
25-
copy_file("${OpenCV_DIR}/bin/Release/opencv_core${OpenCV_NUMBER}.dll")
26-
copy_file("${OpenCV_DIR}/bin/Debug/opencv_core${OpenCV_NUMBER}d.dll")
27-
copy_file("${OpenCV_DIR}/bin/Release/opencv_highgui${OpenCV_NUMBER}.dll")
28-
copy_file("${OpenCV_DIR}/bin/Debug/opencv_highgui${OpenCV_NUMBER}d.dll")
29-
copy_file("${OpenCV_DIR}/bin/Release/opencv_imgproc${OpenCV_NUMBER}.dll")
30-
copy_file("${OpenCV_DIR}/bin/Debug/opencv_imgproc${OpenCV_NUMBER}d.dll")
31-
copy_file("${OpenCV_DIR}/bin/Release/opencv_objdetect${OpenCV_NUMBER}.dll")
32-
copy_file("${OpenCV_DIR}/bin/Debug/opencv_objdetect${OpenCV_NUMBER}d.dll")
20+
21+
copy_file("opencv_core${OpenCV_NUMBER}.dll" "${OpenCV_DIR}/bin")
22+
copy_file("opencv_core${OpenCV_NUMBER}d.dll" "${OpenCV_DIR}/bin")
23+
copy_file("opencv_highgui${OpenCV_NUMBER}.dll" "${OpenCV_DIR}/bin")
24+
copy_file("opencv_highgui${OpenCV_NUMBER}d.dll" "${OpenCV_DIR}/bin")
25+
copy_file("opencv_imgproc${OpenCV_NUMBER}.dll" "${OpenCV_DIR}/bin")
26+
copy_file("opencv_imgproc${OpenCV_NUMBER}d.dll" "${OpenCV_DIR}/bin")
27+
copy_file("opencv_objdetect${OpenCV_NUMBER}.dll" "${OpenCV_DIR}/bin")
28+
copy_file("opencv_objdetect${OpenCV_NUMBER}d.dll" "${OpenCV_DIR}/bin")

‎applications/face_modeling/install.cmake

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
11
include(../copy_file.cmake)
2+
include(../copy_folder.cmake)
23

34
# Copy and Install HDF5 DLLs
4-
copy_file("${HDF5_INCLUDE_DIR}/../bin/hdf5.dll")
5-
copy_file("${HDF5_INCLUDE_DIR}/../bin/hdf5_cpp.dll")
6-
copy_file("${HDF5_INCLUDE_DIR}/../bin/szip.dll")
7-
copy_file("${HDF5_INCLUDE_DIR}/../bin/zlib.dll")
5+
copy_file("hdf5.dll" "${HDF5_INCLUDE_DIR}/../bin")
6+
copy_file("hdf5_cpp.dll" "${HDF5_INCLUDE_DIR}/../bin")
7+
copy_file("szip.dll" "${HDF5_INCLUDE_DIR}/../bin")
8+
copy_file("zlib.dll" "${HDF5_INCLUDE_DIR}/../bin")
89

910
# Copy and Install GLUT DLLs
10-
copy_file("${GLUT_INCLUDE_DIR}/../bin/freeglut.dll")
11+
copy_file("freeglut.dll" "${GLUT_INCLUDE_DIR}/../bin")
1112

1213
# Copy and Install OpenNI2 DLLs
13-
copy_file("${OPENNI2_INCLUDE_DIRS}/../Redist/OpenNI2.dll")
14-
15-
add_custom_command(TARGET ${APPICATION_NAME} POST_BUILD
16-
COMMAND ${CMAKE_COMMAND} -E copy_directory
17-
"${OPENNI2_INCLUDE_DIRS}/../Redist/OpenNI2"
18-
"$<TARGET_FILE_DIR:${APPICATION_NAME}>/OpenNI2")
19-
install(DIRECTORY "${OPENNI2_INCLUDE_DIRS}/../Redist/OpenNI2"
20-
DESTINATION "${BIN_INSTALL_DIR}")
14+
copy_file("OpenNI2.dll" "${OPENNI2_INCLUDE_DIRS}/../Redist")
15+
copy_folder("OpenNI2" "${OPENNI2_INCLUDE_DIRS}/../Redist")

‎applications/object_modeling/install.cmake

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
11
include(../copy_file.cmake)
2+
include(../copy_folder.cmake)
23

34
# Copy and Install HDF5 DLLs
4-
copy_file("${HDF5_INCLUDE_DIR}/../bin/hdf5.dll")
5-
copy_file("${HDF5_INCLUDE_DIR}/../bin/hdf5_cpp.dll")
6-
copy_file("${HDF5_INCLUDE_DIR}/../bin/szip.dll")
7-
copy_file("${HDF5_INCLUDE_DIR}/../bin/zlib.dll")
5+
copy_file("hdf5.dll" "${HDF5_INCLUDE_DIR}/../bin")
6+
copy_file("hdf5_cpp.dll" "${HDF5_INCLUDE_DIR}/../bin")
7+
copy_file("szip.dll" "${HDF5_INCLUDE_DIR}/../bin")
8+
copy_file("zlib.dll" "${HDF5_INCLUDE_DIR}/../bin")
89

910
# Copy and Install GLUT DLLs
10-
copy_file("${GLUT_INCLUDE_DIR}/../bin/freeglut.dll")
11+
copy_file("freeglut.dll" "${GLUT_INCLUDE_DIR}/../bin")
1112

1213
# Copy and Install OpenNI2 DLLs
13-
copy_file("${OPENNI2_INCLUDE_DIRS}/../Redist/OpenNI2.dll")
14-
15-
add_custom_command(TARGET ${APPICATION_NAME} POST_BUILD
16-
COMMAND ${CMAKE_COMMAND} -E copy_directory
17-
"${OPENNI2_INCLUDE_DIRS}/../Redist/OpenNI2"
18-
"$<TARGET_FILE_DIR:${APPICATION_NAME}>/OpenNI2")
19-
install(DIRECTORY "${OPENNI2_INCLUDE_DIRS}/../Redist/OpenNI2"
20-
DESTINATION "${BIN_INSTALL_DIR}")
14+
copy_file("OpenNI2.dll" "${OPENNI2_INCLUDE_DIRS}/../Redist")
15+
copy_folder("OpenNI2" "${OPENNI2_INCLUDE_DIRS}/../Redist")

0 commit comments

Comments
 (0)