From 59dbeae4651cba9df480ccf96b8d24103c6bc743 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Fri, 30 Oct 2015 09:07:23 +0100 Subject: mismerge: don't install contrib/ --- cmake/opentrack-install.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmake') diff --git a/cmake/opentrack-install.cmake b/cmake/opentrack-install.cmake index 8e3d0420..53ede730 100644 --- a/cmake/opentrack-install.cmake +++ b/cmake/opentrack-install.cmake @@ -7,7 +7,7 @@ endif() install(FILES ${CMAKE_SOURCE_DIR}/README.md DESTINATION .) install(DIRECTORY ${CMAKE_SOURCE_DIR}/3rdparty-notices DESTINATION .) -install(DIRECTORY "${CMAKE_SOURCE_DIR}/settings" "${CMAKE_SOURCE_DIR}/contrib" DESTINATION .) +install(DIRECTORY "${CMAKE_SOURCE_DIR}/settings" DESTINATION .) install(FILES "${CMAKE_SOURCE_DIR}/bin/freetrackclient.dll" DESTINATION . ${opentrack-perms}) install(FILES -- cgit v1.2.3