Skip to content

Commit f177311

Browse files
committed
cmake: Use proper output directories
EXECUTABLE_OUTPUT_PATH and LIBRARY_OUTPUT_PATH are deprecated by CMake. Use proper variables and also set up output path for DLLs.
1 parent cfa3b0e commit f177311

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

CMakeLists.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,11 @@ INCLUDE(SetupLibfreenect2Threading)
4545
INCLUDE(GenerateResources)
4646

4747
#set the default path for built executables to the "bin" directory
48-
SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
48+
SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
4949

5050
#set the default path for built libraries to the "lib" directory
51-
SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
51+
SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
52+
SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
5253

5354
# dependencies
5455
FIND_PACKAGE(PkgConfig) # try find PKGConfig as it will be used if found
@@ -223,7 +224,7 @@ TARGET_LINK_LIBRARIES(freenect2 ${LIBRARIES})
223224
CONFIGURE_FILE(freenect2.cmake.in "${PROJECT_BINARY_DIR}/freenect2Config.cmake" @ONLY)
224225
CONFIGURE_FILE(freenect2.pc.in "${PROJECT_BINARY_DIR}/freenect2.pc" @ONLY)
225226

226-
INSTALL(TARGETS freenect2 DESTINATION lib)
227+
INSTALL(TARGETS freenect2 DESTINATION lib RUNTIME DESTINATION bin)
227228
INSTALL(DIRECTORY "${MY_DIR}/include/${PROJECT_NAME}" DESTINATION include PATTERN "*.in" EXCLUDE)
228229
INSTALL(DIRECTORY "${PROJECT_BINARY_DIR}/${PROJECT_NAME}" DESTINATION include)
229230
INSTALL(FILES "${PROJECT_BINARY_DIR}/freenect2Config.cmake" DESTINATION lib/cmake/freenect2/)

0 commit comments

Comments
 (0)