diff --git a/toonz/sources/CMakeLists.txt b/toonz/sources/CMakeLists.txt index 2e621d7..30cb181 100644 --- a/toonz/sources/CMakeLists.txt +++ b/toonz/sources/CMakeLists.txt @@ -128,15 +128,15 @@ message(STATUS "Thirdpary Library Search path:" ${THIRDPARTY_LIBS_HINTS}) if(BUILD_ENV_MSVC) if(MSVC_VERSION GREATER 1800) if(CMAKE_SIZEOF_VOID_P EQUAL 4) - set(QT_PATH "C:/Qt/5.9.2/msvc2015" CACHE PATH "Qt instlattion directory") + set(QT_PATH "C:/Qt/5.9.2/msvc2015" CACHE PATH "Qt installation directory") else() - set(QT_PATH "C:/Qt/5.9.2/msvc2015_64" CACHE PATH "Qt instlattion directory") + set(QT_PATH "C:/Qt/5.9.2/msvc2015_64" CACHE PATH "Qt installation directory") endif() else() if(CMAKE_SIZEOF_VOID_P EQUAL 4) - set(QT_PATH "C:/Qt/5.9.2/msvc2013" CACHE PATH "Qt instlattion directory") + set(QT_PATH "C:/Qt/5.9.2/msvc2013" CACHE PATH "Qt installation directory") else() - set(QT_PATH "C:/Qt/5.9.2/msvc2013_64" CACHE PATH "Qt instlattion directory") + set(QT_PATH "C:/Qt/5.9.2/msvc2013_64" CACHE PATH "Qt installation directory") endif() endif() if(NOT EXISTS ${QT_PATH}) @@ -158,7 +158,7 @@ elseif(BUILD_ENV_APPLE) endif() message("PLATFORM:" ${PLATFORM}) if(PLATFORM EQUAL 64) - set(QT_PATH "~/Qt5.9.2/5.9.2/clang_64/lib" CACHE PATH "Qt instlattion directory") + set(QT_PATH "~/Qt5.9.2/5.9.2/clang_64/lib" CACHE PATH "Qt installation directory") set(QT_LIB_PATH "${QT_PATH}/") set(CMAKE_PREFIX_PATH "${QT_LIB_PATH}cmake/") @@ -170,7 +170,7 @@ elseif(BUILD_ENV_APPLE) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64 -std=c++11 -stdlib=libc++ -fno-implicit-templates") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64") elseif(PLATFORM EQUAL 32) - set(QT_PATH "~/Qt5.9.2/5.9.2/clang_32/lib" CACHE PATH "Qt instlattion directory") + set(QT_PATH "~/Qt5.9.2/5.9.2/clang_32/lib" CACHE PATH "Qt installation directory") set(QT_LIB_PATH "${QT_PATH}/") set(CMAKE_PREFIX_PATH "${QT_LIB_PATH}cmake/") @@ -226,6 +226,7 @@ if(BUILD_ENV_APPLE) set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) set(CMAKE_INSTALL_RPATH ${QT_LIB_PATH}) set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + set(CMAKE_FIND_FRAMEWORK LAST) list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${QT_LIB_PATH}" isSystemDir) if("${isSystemDir}" STREQUAL "-1") set(CMAKE_INSTALL_RPATH "${QT_LIB_PATH}")