From 8df9289d074e6b674390ba6a4f5c310a9c2efd16 Mon Sep 17 00:00:00 2001 From: mdinger Date: Fri, 18 Apr 2014 01:16:26 -0400 Subject: [PATCH] Add runtime location linux will use --- cMake/FreeCadMacros.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cMake/FreeCadMacros.cmake b/cMake/FreeCadMacros.cmake index 0a089d2380..5f243ad23b 100644 --- a/cMake/FreeCadMacros.cmake +++ b/cMake/FreeCadMacros.cmake @@ -211,10 +211,13 @@ ENDMACRO(GET_MSVC_PRECOMPILED_SOURCE) MACRO(SET_BIN_DIR ProjectName OutputName) set_target_properties(${ProjectName} PROPERTIES OUTPUT_NAME ${OutputName}) if(${ARGC} GREATER 2) + # VS_IDE (and perhaps others) make Release and Debug subfolders. This removes them. + set_target_properties(${ProjectName} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}${ARGV2}) set_target_properties(${ProjectName} PROPERTIES RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}${ARGV2}) set_target_properties(${ProjectName} PROPERTIES RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}${ARGV2}) set_target_properties(${ProjectName} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}${ARGV2}) else(${ARGC} GREATER 2) + set_target_properties(${ProjectName} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) set_target_properties(${ProjectName} PROPERTIES RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/bin) set_target_properties(${ProjectName} PROPERTIES RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/bin) set_target_properties(${ProjectName} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)