From ed8ba118ea567e3e7abe49bc91f40cb6adcc8e3a Mon Sep 17 00:00:00 2001 From: mdinger Date: Sun, 13 Apr 2014 03:20:55 -0400 Subject: [PATCH] Send FreeCAD bins and libs to correct locations --- cMake/FreeCadMacros.cmake | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/cMake/FreeCadMacros.cmake b/cMake/FreeCadMacros.cmake index d263bae39..ad48ce555 100644 --- a/cMake/FreeCadMacros.cmake +++ b/cMake/FreeCadMacros.cmake @@ -211,8 +211,25 @@ MACRO(SET_BIN_DIR ProjectName OutputName OutputDir) set_target_properties(${ProjectName} PROPERTIES DEBUG_OUTPUT_NAME "${OutputName}_d") set_target_properties(${ProjectName} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}${OutputDir}) else(WIN32) - set_target_properties(${ProjectName} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}${OutputDir}) - set_target_properties(${ProjectName} PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}${OutputDir}) + SET(COND_IS_FREECAD_BIN ${OutputName} STREQUAL "FreeCADMain" OR + ${OutputName} STREQUAL "FreeCADMainCmd") + SET(COND_IS_FREECAD_LIB ${OutputName} STREQUAL "FreeCADApp" OR + ${OutputName} STREQUAL "FreeCADBase" OR + ${OutputName} STREQUAL "FreeCADGui" OR + ${OutputName} STREQUAL "FreeCADMainPy" OR + ${OutputName} STREQUAL "FreeCADGuiPy") + + IF(${COND_IS_FREECAD_BIN}) + set_target_properties(${ProjectName} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}${OutputDir}) + ELSEIF(${COND_IS_FREECAD_LIB}) + set_target_properties(${ProjectName} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) + ELSE(${COND_IS_FREECAD_BIN}) + set_target_properties(${ProjectName} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}${OutputDir}) + ENDIF(${COND_IS_FREECAD_BIN}) + + set_target_properties(${ProjectName} PROPERTIES INSTALL_RPATH ${INSTALL_RPATH}) + UNSET(COND_IS_FREECAD_BIN) + UNSET(COND_IS_FREECAD_LIB) endif(WIN32) if(MSVC_IDE)