From de03173e6d21ac8fb7ee6d6243d7c8f9e3a511ad Mon Sep 17 00:00:00 2001 From: Alexander Gessler Date: Wed, 18 Sep 2013 14:37:49 +0200 Subject: [PATCH] CMake: simplify. --- tools/assimp_cmd/CMakeLists.txt | 2 +- tools/assimp_view/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/assimp_cmd/CMakeLists.txt b/tools/assimp_cmd/CMakeLists.txt index 8581eba09..e6f34fefb 100644 --- a/tools/assimp_cmd/CMakeLists.txt +++ b/tools/assimp_cmd/CMakeLists.txt @@ -22,7 +22,7 @@ SET_PROPERTY(TARGET assimp_cmd PROPERTY DEBUG_POSTFIX ${ASSIMP_DEBUG_POSTFIX}) IF( WIN32 ) ADD_CUSTOM_COMMAND(TARGET assimp_cmd PRE_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_if_different $ ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} $) + COMMAND ${CMAKE_COMMAND} -E copy_if_different $ $) ENDIF( WIN32 ) TARGET_LINK_LIBRARIES( assimp_cmd assimp ${ZLIB_LIBRARIES}) diff --git a/tools/assimp_view/CMakeLists.txt b/tools/assimp_view/CMakeLists.txt index 4673cfeb4..167601b24 100644 --- a/tools/assimp_view/CMakeLists.txt +++ b/tools/assimp_view/CMakeLists.txt @@ -50,7 +50,7 @@ ADD_DEFINITIONS( -D_CRT_SECURE_NO_WARNINGS ) # ADD_CUSTOM_COMMAND(TARGET assimp_viewer PRE_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_if_different $ ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} $) + COMMAND ${CMAKE_COMMAND} -E copy_if_different $ $) # Link the executable to the assimp + dx libs. TARGET_LINK_LIBRARIES ( assimp_viewer assimp ${DirectX_LIBRARY} ${DirectX_D3DX9_LIBRARY} comctl32.lib Winmm.lib )