From 4f6595ed08de893f98c700d1edef3557db1ddaab Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 5 Jan 2016 11:43:49 -0800 Subject: [PATCH] fix makefiles build on OS X --- cmake/externals/faceshift/CMakeLists.txt | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/cmake/externals/faceshift/CMakeLists.txt b/cmake/externals/faceshift/CMakeLists.txt index b18b861912..14e6851c77 100644 --- a/cmake/externals/faceshift/CMakeLists.txt +++ b/cmake/externals/faceshift/CMakeLists.txt @@ -21,10 +21,25 @@ ExternalProject_Get_Property(${EXTERNAL_NAME} INSTALL_DIR) string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER) set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${INSTALL_DIR}/include CACHE FILEPATH "Path to Faceshift include directory") +set(LIBRARY_DEBUG_PATH "lib/Debug") +set(LIBRARY_RELEASE_PATH "lib/Release") + if (WIN32) - set(${EXTERNAL_NAME_UPPER}_LIBRARY_DEBUG ${INSTALL_DIR}/lib/Debug/faceshift.lib CACHE FILEPATH "Faceshift libraries") - set(${EXTERNAL_NAME_UPPER}_LIBRARY_RELEASE ${INSTALL_DIR}/lib/Release/faceshift.lib CACHE FILEPATH "Faceshift libraries") + set(LIBRARY_PREFIX "") + set(LIBRARY_EXT "lib") elseif (APPLE) - set(${EXTERNAL_NAME_UPPER}_LIBRARY_DEBUG ${INSTALL_DIR}/lib/Debug/libfaceshift.a CACHE FILEPATH "Faceshift libraries") - set(${EXTERNAL_NAME_UPPER}_LIBRARY_RELEASE ${INSTALL_DIR}/lib/Release/libfaceshift.a CACHE FILEPATH "Faceshift libraries") + set(LIBRARY_EXT "a") + + if (CMAKE_GENERATOR STREQUAL "Unix Makefiles") + set(LIBRARY_PREFIX "lib") + set(LIBRARY_DEBUG_PATH "build") + set(LIBRARY_RELEASE_PATH "build") + else () + set(LIBRARY_PREFIX "") + endif () endif() + +set(${EXTERNAL_NAME_UPPER}_LIBRARY_DEBUG + ${INSTALL_DIR}/${LIBRARY_DEBUG_PATH}/${LIBRARY_PREFIX}faceshift.${LIBRARY_EXT} CACHE FILEPATH "Faceshift libraries") +set(${EXTERNAL_NAME_UPPER}_LIBRARY_RELEASE +${INSTALL_DIR}/${LIBRARY_RELEASE_PATH}/${LIBRARY_PREFIX}faceshift.${LIBRARY_EXT} CACHE FILEPATH "Faceshift libraries")