Xcode IDE support
This commit is contained in:
parent
55ca6bddd5
commit
83fae996d8
6 changed files with 28 additions and 28 deletions
|
@ -157,7 +157,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 "/usr/local/Cellar/qt/5.12.2/lib" CACHE PATH "Qt instlattion directory")
|
||||
set(QT_LIB_PATH "${QT_PATH}/")
|
||||
set(CMAKE_PREFIX_PATH "${QT_LIB_PATH}cmake/")
|
||||
|
||||
|
@ -277,7 +277,7 @@ macro(_find_toonz_library OUT_LIB_LIST IN_LIB_LIST)
|
|||
unset(COREPATH CACHE)
|
||||
# find しても cmake が走るときにはできていないので完全なパス名を生成して返すだけ
|
||||
if(BUILD_ENV_APPLE)
|
||||
set(LIBPATH ${CMAKE_CURRENT_BINARY_DIR}/../${arg}/lib${arg}${CMAKE_SHARED_LIBRARY_SUFFIX})
|
||||
set(LIBPATH "\$<TARGET_FILE:${arg}>")
|
||||
else()
|
||||
set(LIBPATH ${arg})
|
||||
endif()
|
||||
|
|
|
@ -200,7 +200,7 @@ elseif(BUILD_ENV_APPLE)
|
|||
find_library(COCOA_LIB Cocoa)
|
||||
|
||||
set(EXTRA_LIBS
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../tnzcore/libtnzcore.dylib
|
||||
"$<TARGET_FILE:tnzcore>"
|
||||
${USB_LIB}
|
||||
${TWAIN_LIB}
|
||||
${IOKIT_LIB}
|
||||
|
|
|
@ -117,8 +117,8 @@ if(BUILD_ENV_MSVC)
|
|||
)
|
||||
elseif(BUILD_ENV_APPLE)
|
||||
set(EXTRA_LIBS
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../tnzcore/libtnzcore.dylib
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../tnzbase/libtnzbase.dylib
|
||||
"$<TARGET_FILE:tnzcore>"
|
||||
"$<TARGET_FILE:tnzbase>"
|
||||
)
|
||||
|
||||
target_link_libraries(tnzext
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
set(VERSION 1.3)
|
||||
set(VERSION 1.3)
|
||||
|
||||
set(MOC_HEADERS
|
||||
addfilmstripframespopup.h
|
||||
|
@ -479,30 +479,30 @@ if(BUILD_ENV_APPLE)
|
|||
message(" ==> App Bundle: " ${loc})
|
||||
message(" ==> Mach-o: " ${bin})
|
||||
foreach(lib ${EXTRA_LIBS})
|
||||
message(" copy:" ${lib} "==>" ${CMAKE_CURRENT_BINARY_DIR}/OpenToonz.app/Contents/MacOS/)
|
||||
add_custom_command(TARGET OpenToonz POST_BUILD COMMAND cp ${lib} ${CMAKE_CURRENT_BINARY_DIR}/OpenToonz.app/Contents/MacOS/)
|
||||
message(" copy:" ${lib} "==>" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
|
||||
add_custom_command(TARGET OpenToonz POST_BUILD COMMAND cp ${lib} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
|
||||
endforeach()
|
||||
|
||||
add_custom_command(TARGET OpenToonz
|
||||
POST_BUILD COMMAND
|
||||
${CMAKE_INSTALL_NAME_TOOL} -add_rpath @executable_path/. ${bin}
|
||||
)
|
||||
add_custom_command(TARGET OpenToonz
|
||||
POST_BUILD COMMAND
|
||||
${CMAKE_INSTALL_NAME_TOOL} -add_rpath ${CMAKE_INSTALL_RPATH} ${bin}
|
||||
)
|
||||
add_custom_command(TARGET OpenToonz POST_BUILD COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/OpenToonz.app/Contents/Resources)
|
||||
|
||||
add_custom_command(TARGET OpenToonz POST_BUILD COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/OpenToonz.app/Contents/Resources)
|
||||
add_custom_command(TARGET OpenToonz POST_BUILD COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/qss)
|
||||
add_custom_command(TARGET OpenToonz POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../install/SystemVar.ini ${CMAKE_CURRENT_BINARY_DIR}/OpenToonz.app/Contents/Resources)
|
||||
|
||||
add_custom_command(TARGET OpenToonz POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:tcomposer> ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} DEPENDS tcomposer)
|
||||
add_custom_command(TARGET OpenToonz POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:tcleanup> ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} DEPENDS tcleanup)
|
||||
add_custom_command(TARGET OpenToonz POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:tconverter> ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} DEPENDS tconverter)
|
||||
add_custom_command(TARGET OpenToonz POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:tfarmcontroller> ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} DEPENDS tfarmcontroller)
|
||||
add_custom_command(TARGET OpenToonz POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:tfarmserver> ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} DEPENDS tfarmserver)
|
||||
|
||||
add_custom_command(TARGET OpenToonz POST_BUILD COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/../Resources)
|
||||
add_custom_command(TARGET OpenToonz POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../install/SystemVar.ini ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/../Resources)
|
||||
|
||||
add_custom_command(TARGET OpenToonz POST_BUILD COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/../../../qss)
|
||||
|
||||
add_custom_command(TARGET OpenToonz
|
||||
POST_BUILD COMMAND
|
||||
${CMAKE_INSTALL_NAME_TOOL} -add_rpath @executable_path/. ${bin} || true
|
||||
)
|
||||
add_custom_command(TARGET OpenToonz
|
||||
POST_BUILD COMMAND
|
||||
${CMAKE_INSTALL_NAME_TOOL} -add_rpath ${CMAKE_INSTALL_RPATH} ${bin} || true
|
||||
)
|
||||
|
||||
elseif(BUILD_ENV_UNIXLIKE AND BUILD_TARGET_WIN)
|
||||
# Setup files on Windows platform while cross compilation.
|
||||
install(
|
||||
|
|
|
@ -45,9 +45,9 @@ if(BUILD_ENV_MSVC)
|
|||
)
|
||||
elseif(BUILD_ENV_APPLE)
|
||||
set(EXTRA_LIBS
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../../tnzcore/libtnzcore.dylib
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../../tnzbase/libtnzbase.dylib
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../../toonzlib/libtoonzlib.dylib
|
||||
"$<TARGET_FILE:tnzcore>"
|
||||
"$<TARGET_FILE:tnzbase>"
|
||||
"$<TARGET_FILE:toonzlib>"
|
||||
)
|
||||
add_dependencies(tfarm tnzcore tnzbase toonzlib tnzext)
|
||||
elseif(BUILD_ENV_UNIXLIKE)
|
||||
|
|
|
@ -361,9 +361,9 @@ if(BUILD_ENV_MSVC)
|
|||
)
|
||||
elseif(BUILD_ENV_APPLE)
|
||||
set(EXTRA_LIBS
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../tnzcore/libtnzcore.dylib
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../tnzbase/libtnzbase.dylib
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../tnzext/libtnzext.dylib
|
||||
"$<TARGET_FILE:tnzcore>"
|
||||
"$<TARGET_FILE:tnzbase>"
|
||||
"$<TARGET_FILE:tnzext>"
|
||||
${USB_LIB}
|
||||
${MYPAINT_LIB_LDFLAGS}
|
||||
)
|
||||
|
|
Loading…
Reference in a new issue