razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

Cleanup: CMake style

Browse source 
Use parens on newline, avoids diff-noise when adding values.
This commit is contained in:
Campbell Barton 2016-07-23 04:59:47 +10:00
parent fef27f08d4
commit 9ece9c0c92
22 changed files with 214 additions and 104 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
plugins/blur/CMakeLists.txt
View file

@ -4,10 +4,12 @@ set(PLUGINSDK_UTILS_PATH ../)
set(HEADERS
${PLUGINSDK_ROOT}/toonz_plugin.h
${PLUGINSDK_ROOT}/toonz_hostif.h)
${PLUGINSDK_ROOT}/toonz_hostif.h
)
set(SOURCES
blur.cpp)
blur.cpp
)
if(APPLE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -stdlib=libc++")
@ -17,6 +19,7 @@ add_library(blur SHARED ${HEADERS} ${SOURCES})
set_target_properties(blur PROPERTIES
PREFIX ""
SUFFIX ".plugin")
SUFFIX ".plugin"
)
include_directories(${PLUGINSDK_ROOT} ${PLUGINSDK_UTILS_PATH})

9
plugins/geom/CMakeLists.txt
View file

@ -5,10 +5,12 @@ set(PLUGINSDK_UTILS_PATH ../)
set(HEADERS
${PLUGINSDK_ROOT}/toonz_plugin.h
${PLUGINSDK_ROOT}/toonz_hostif.h)
${PLUGINSDK_ROOT}/toonz_hostif.h
)
set(SOURCES
geom.cpp)
geom.cpp
)
if(APPLE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -stdlib=libc++")
@ -18,6 +20,7 @@ add_library(geom SHARED ${HEADERS} ${SOURCES})
set_target_properties(geom PROPERTIES
PREFIX ""
SUFFIX ".plugin")
SUFFIX ".plugin"
)
include_directories(${PLUGINSDK_ROOT} ${PLUGINSDK_UTILS_PATH})

9
plugins/multiplugin/CMakeLists.txt
View file

@ -4,10 +4,12 @@ set(PLUGINSDK_UTILS_PATH ../)
set(HEADERS
${PLUGINSDK_ROOT}/toonz_plugin.h
${PLUGINSDK_ROOT}/toonz_hostif.h)
${PLUGINSDK_ROOT}/toonz_hostif.h
)
set(SOURCES
multi.cpp)
multi.cpp
)
if(APPLE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -stdlib=libc++")
@ -17,6 +19,7 @@ add_library(multi SHARED ${HEADERS} ${SOURCES})
set_target_properties(multi PROPERTIES
PREFIX ""
SUFFIX ".plugin")
SUFFIX ".plugin"
)
include_directories(${PLUGINSDK_ROOT} ${PLUGINSDK_UTILS_PATH})

21
toonz/sources/CMakeLists.txt
View file

@ -145,7 +145,8 @@ find_package(Qt5 REQUIRED
Widgets
PrintSupport
LinguistTools
Multimedia)
Multimedia
)
if(WIN32)
include_directories(
@ -200,15 +201,18 @@ if(WIN32)
set(GL_LIB opengl32.lib)
set(Z_LIB
optimized ${SDKROOT}/zlib-1.2.8/lib/zlib-1.2.8_${MSVC_LIB_VERSION}${PLATFORM2}.lib
debug ${SDKROOT}/zlib-1.2.8/lib/zlib-1.2.8_${MSVC_LIB_VERSION}${PLATFORM2}d.lib)
debug ${SDKROOT}/zlib-1.2.8/lib/zlib-1.2.8_${MSVC_LIB_VERSION}${PLATFORM2}d.lib
)
set(JPEG_LIB ${SDKROOT}/LibJPEG/jpeg-9/lib/LibJPEG-9_${MSVC_LIB_VERSION}${PLATFORM2}.lib)
set(TIFF_INCLUDE_DIR ${SDKROOT}/tiff-4.0.3/libtiff)
set(TIFF_LIB
optimized ${SDKROOT}/tiff-4.0.3/lib/LibTIFF-4.0.3_${MSVC_LIB_VERSION}${PLATFORM2}.lib
debug ${SDKROOT}/tiff-4.0.3/lib/LibTIFF-4.0.3_${MSVC_LIB_VERSION}${PLATFORM2}d.lib)
debug ${SDKROOT}/tiff-4.0.3/lib/LibTIFF-4.0.3_${MSVC_LIB_VERSION}${PLATFORM2}d.lib
)
set(PNG_LIB
optimized ${SDKROOT}/libpng-1.6.21/lib/libpng16_${MSVC_LIB_VERSION}${PLATFORM2}.lib
debug ${SDKROOT}/libpng-1.6.21/lib/libpng16_${MSVC_LIB_VERSION}${PLATFORM2}d.lib)
debug ${SDKROOT}/libpng-1.6.21/lib/libpng16_${MSVC_LIB_VERSION}${PLATFORM2}d.lib
)
set(GLEW_LIB ${SDKROOT}/glew/glew-1.9.0/lib/glew${PLATFORM}.lib)
set(LZ4_LIB ${SDKROOT}/Lz4/Lz4_131/lz4_${PLATFORM}.lib)
set(SUPERLU_LIB ${SDKROOT}/superlu/SuperLU_${MSVC_LIB_VERSION}_${PLATFORM}.lib)
@ -421,14 +425,16 @@ function(add_translation module)
set(name "${CMAKE_SOURCE_DIR}/translations/${lang}/${module}.ts")
list(APPEND translation ${name})
set_source_files_properties(${name} PROPERTIES
OUTPUT_LOCATION "${CMAKE_BINARY_DIR}/loc/${lang}")
OUTPUT_LOCATION "${CMAKE_BINARY_DIR}/loc/${lang}"
)
endforeach()
qt5_create_translation(message ${translation} ${ARGN})
add_custom_target("translation_${module}" DEPENDS ${message})
set_target_properties("translation_${module}" PROPERTIES
EXCLUDE_FROM_DEFAULT_BUILD TRUE)
EXCLUDE_FROM_DEFAULT_BUILD TRUE
)
endfunction()
set(CMAKE_C_FLAGS "${C_WARNINGS} ${CMAKE_C_FLAGS}")
@ -466,5 +472,6 @@ if(APPLE)
add_custom_command(TARGET executable
POST_BUILD COMMAND
${CMAKE_INSTALL_NAME_TOOL} -add_rpath ${CMAKE_INSTALL_RPATH}
$<TARGET_FILE:executable>)
$<TARGET_FILE:executable>
)
endif()

6
toonz/sources/colorfx/CMakeLists.txt
View file

@ -4,7 +4,8 @@ set(HEADERS
rasterstyles.h
regionstyles.h
strokestyles.h
zigzagstyles.h)
zigzagstyles.h
)
set(SOURCES
colorfx.cpp
@ -12,7 +13,8 @@ set(SOURCES
rasterstyles.cpp
regionstyles.cpp
strokestyles.cpp
zigzagstyles.cpp)
zigzagstyles.cpp
)
add_translation(colorfx ${HEADERS} ${SOURCES})

40
toonz/sources/image/CMakeLists.txt
View file

@ -20,7 +20,8 @@ set(HEADERS
../include/tnzimage.h
mov/tiio_mov_proxy.h
3gp/tiio_3gp_proxy.h
mesh/tiio_mesh.h)
mesh/tiio_mesh.h
)
set(SOURCES
tiio.cpp
@ -46,31 +47,38 @@ set(SOURCES
tzl/tiio_tzl.cpp
mov/tiio_mov_proxy.cpp
3gp/tiio_3gp_proxy.cpp
mesh/tiio_mesh.cpp)
mesh/tiio_mesh.cpp
)
if(WIN32)
set(HEADERS ${HEADERS}
avi/tiio_avi.h
mov/tiio_mov.h
3gp/tiio_3gp.h)
3gp/tiio_3gp.h
)
set(SOURCES ${SOURCES}
avi/tiio_avi.cpp
mov/tiio_movW.cpp
3gp/tiio_3gpW.cpp)
3gp/tiio_3gpW.cpp
)
else()
set(HEADERS ${HEADERS}
mov/tiio_movM.h
3gp/tiio_3gpM.h)
3gp/tiio_3gpM.h
)
set(SOURCES ${SOURCES}
mov/tiio_movM.cpp
3gp/tiio_3gpM.cpp)
3gp/tiio_3gpM.cpp
)
elseif(UNIX)
set(HEADERS ${HEADERS}
3gp/tiio_3gp_proxy.h
mov/tiio_mov_proxy.h)
mov/tiio_mov_proxy.h
)
set(SOURCES ${SOURCES}
mov/tiio_mov_proxy.cpp
3gp/tiio_3gp_proxy.cpp)
3gp/tiio_3gp_proxy.cpp
)
endif()
add_library(image SHARED ${HEADERS} ${SOURCES})
@ -115,17 +123,19 @@ endif()
if(WIN32)
set(EXTRA_LIBS
${TNZLIBS}
vfw32.lib)
vfw32.lib
)
elseif(APPLE)
if(PLATFORM EQUAL 32)
find_library(CORE_SERVICES_LIB CoreServices)
set(OSX_10_6_SDK_PATH "")
if(NOT OSX_10_6_SDK_PATH)
message(FATAL_ERROR "Set variable 'OSX_10_6_SDK_PATH'")
message(FATAL_ERROR "Set variable 'OSX_10_6_SDK_PATH'")
endif()
find_library(QD_LIB
NAMES QD
PATHS OSX10_6_SDK_PATH)
NAMES QD
PATHS OSX10_6_SDK_PATH
)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -F ${OSX_10_6_SDK_PATH}")
endif()
set(EXTRA_LIBS
@ -133,11 +143,13 @@ elseif(APPLE)
${QT_LIB}
${CARBON_LIB}
${CORE_SERVICES_LIB}
${QD_LIB})
${QD_LIB}
)
else()
# Generic Unix
set(EXTRA_LIBS
${TNZLIBS})
${TNZLIBS}
)
endif()
target_link_libraries(image Qt5::Core Qt5::Network ${Z_LIB} ${GLUT_LIB} ${GL_LIB} ${JPEG_LIB} ${TIFF_LIB} ${PNG_LIB} ${EXTRA_LIBS})

6
toonz/sources/sound/CMakeLists.txt
View file

@ -3,14 +3,16 @@ set(HEADERS
aiff/tsio_aiff.h
raw/tsio_raw.h
../include/tnzsound.h
tsio.h)
tsio.h
)
set(SOURCES
tsio.cpp
tsioutils.cpp
wav/tsio_wav.cpp
aiff/tsio_aiff.cpp
raw/tsio_raw.cpp)
raw/tsio_raw.cpp
)
add_library(sound SHARED ${HEADERS} ${SOURCES})
add_definitions(

6
toonz/sources/stdfx/CMakeLists.txt
View file

@ -70,7 +70,8 @@ set(HEADERS
iwa_simplexnoise.h
iwa_noise1234.h
iwa_fresnel.h
iwa_pnperspectivefx.h)
iwa_pnperspectivefx.h
)
set(SOURCES
adjustlevelsfx.cpp
@ -242,7 +243,8 @@ set(SOURCES
iwa_tilefx.cpp
iwa_simplexnoise.cpp
iwa_noise1234.cpp
iwa_pnperspectivefx.cpp)
iwa_pnperspectivefx.cpp
)
set(OBJCSOURCES
)

9
toonz/sources/t32bitsrv/CMakeLists.txt
View file

@ -5,7 +5,8 @@ add_executable(t32bitsrv
t32fontmsg.cpp
t32fontmsg.h
t32movmsg.cpp
t32movmsg.h)
t32movmsg.h
)
if(WIN32)
include_directories(
@ -18,7 +19,8 @@ target_link_libraries(t32bitsrv
Qt5::Core
Qt5::Network
tnzcore
image)
image
)
if(APPLE AND PLATFORM EQUAL 32)
get_target_property(bin t32bitsrv LOCATION)
@ -33,5 +35,6 @@ if(APPLE AND PLATFORM EQUAL 32)
add_custom_command(TARGET t32bitsrv
POST_BUILD COMMAND
${CMAKE_INSTALL_NAME_TOOL} -add_rpath @executable_path/. ${bin})
${CMAKE_INSTALL_NAME_TOOL} -add_rpath @executable_path/. ${bin}
)
endif()

6
toonz/sources/tcleanupper/CMakeLists.txt
View file

@ -1,8 +1,10 @@
add_executable(tcleanup
tcleanupper.cpp)
tcleanupper.cpp
)
target_link_libraries(tcleanup
Qt5::Core
Qt5::Widgets
tfarm
image)
image
)

6
toonz/sources/tcomposer/CMakeLists.txt
View file

@ -1,5 +1,6 @@
add_executable(tcomposer
tcomposer.cpp)
tcomposer.cpp
)
target_link_libraries(tcomposer
Qt5::Core
@ -11,4 +12,5 @@ target_link_libraries(tcomposer
sound
image
colorfx
toonzqt)
toonzqt
)

6
toonz/sources/tconverter/CMakeLists.txt
View file

@ -1,7 +1,9 @@
add_executable(tconverter
tconverter.cpp)
tconverter.cpp
)
target_link_libraries(tconverter
Qt5::Core
toonzlib
image)
image
)

36
toonz/sources/tnzbase/CMakeLists.txt
View file

@ -1,6 +1,7 @@
set(MOC_HEADERS
../include/tcacheresourcepool.h
../common/tfx/trendererP.h)
../common/tfx/trendererP.h
)
set(HEADERS ${MOC_HEADERS}
../common/twain/ttwain.h
@ -61,7 +62,8 @@ set(HEADERS ${MOC_HEADERS}
../include/tparser.h
../include/ttokenizer.h
../include/tunit.h
../include/tzeraryfx.h)
../include/tzeraryfx.h
)
set(SOURCES
permissionsmanager.cpp
@ -109,14 +111,17 @@ set(SOURCES
../common/expressions/ttokenizer.cpp
../common/tunit/tunit.cpp
tscanner/tscannerutil.cpp
tscanner/tscannerepson.cpp)
tscanner/tscannerepson.cpp
)
if(WIN32)
set(SOURCES ${SOURCES}
tscanner/TScannerIO/TUSBScannerIO_W.cpp)
tscanner/TScannerIO/TUSBScannerIO_W.cpp
)
else()
set(SOURCES ${SOURCES}
tscanner/TScannerIO/TUSBScannerIO_M.cpp)
tscanner/TScannerIO/TUSBScannerIO_M.cpp
)
endif()
set(OBJCSOURCES
@ -127,23 +132,27 @@ set(OBJCSOURCES
../common/twain/ttwain_util.c
../common/twain/ttwain_win.c
tscanner/tscanner.cpp
tscanner/tscannertwain.cpp)
tscanner/tscannertwain.cpp
)
if(WIN32)
set(OBJCSOURCES ${OBJCSOURCES}
../common/twain/ttwain_stateW.c
../common/twain/ttwain_utilW.c
../common/twain/ttwain_winW.c)
../common/twain/ttwain_winW.c
)
elseif(APPLE)
set(OBJCSOURCES ${OBJCSOURCES}
../common/twain/ttwain_stateM.c
../common/twain/ttwain_utilM.c
../common/twain/ttwain_winM.c)
../common/twain/ttwain_winM.c
)
elseif(UNIX)
set(OBJCSOURCES ${OBJCSOURCES}
../common/twain/ttwain_stateX.c
../common/twain/ttwain_utilX.c
../common/twain/ttwain_winX.c)
../common/twain/ttwain_winX.c
)
endif()
if(APPLE)
@ -182,7 +191,8 @@ include_directories(
if(WIN32)
set(EXTRA_LIBS
tnzcore)
tnzcore
)
elseif(APPLE)
find_library(TWAIN_LIB TWAIN)
find_library(IOKIT_LIB IOKit)
@ -193,13 +203,15 @@ elseif(APPLE)
${USB_LIB}
${TWAIN_LIB}
${IOKIT_LIB}
${COCOA_LIB})
${COCOA_LIB}
)
target_link_libraries(tnzbase Qt5::Core Qt5::Gui)
elseif(UNIX)
_find_toonz_library(EXTRA_LIBS "tnzcore")
set(EXTRA_LIBS ${EXTRA_LIBS}
${SDL_LIB_LIBRARIES})
${SDL_LIB_LIBRARIES}
)
include_directories(
SYSTEM

36
toonz/sources/tnzcore/CMakeLists.txt
View file

@ -5,7 +5,8 @@ set(MOC_HEADERS
../include/tipcsrv.h
../include/tipcsrvP.h
../include/tmsgcore.h
../include/tfunctorinvoker.h)
../include/tfunctorinvoker.h
)
set(HEADERS ${MOC_HEADERS}
../common/trop/loop_macros.h
@ -118,7 +119,8 @@ set(HEADERS ${MOC_HEADERS}
../include/t32bitsrv_wrap.h
../include/tenv.h
../include/tmeshimage.h
../include/tgldisplaylistsmanager.h)
../include/tgldisplaylistsmanager.h
)
set(SOURCES
../common/tcore/tdata.cpp
@ -240,25 +242,31 @@ set(SOURCES
../common/tsystem/tsystempd.cpp
../common/tapptools/tenv.cpp
../common/tmeshimage/tmeshimage.cpp
../common/tmsgcore.cpp)
../common/tmsgcore.cpp
)
if(WIN32)
set(SOURCES ${SOURCES}
../common/tsound/tsound_nt.cpp
../common/tvrender/tfont_nt.cpp)
../common/tvrender/tfont_nt.cpp
)
elseif(APPLE)
set(SOURCES ${SOURCES}
../common/tsound/tsound_mac.cpp
../common/tvrender/tfont_mac.cpp)
../common/tvrender/tfont_mac.cpp
)
elseif(UNIX)
set(SOURCES ${SOURCES}
../common/tvrender/tfont_qt.cpp)
../common/tvrender/tfont_qt.cpp
)
if(SDL_LIB_FOUND)
set(SOURCES ${SOURCES}
../common/tsound/tsound_sdl.cpp)
../common/tsound/tsound_sdl.cpp
)
else()
set(SOURCES ${SOURCES}
../common/tsound/tsound_x.cpp)
../common/tsound/tsound_x.cpp
)
endif()
endif()
@ -313,7 +321,8 @@ if(WIN32)
mpr.lib
winmm.lib
opengl32.lib
glu32.lib)
glu32.lib
)
elseif(APPLE)
find_library(AUDIOUNIT_LIB AudioUnit)
find_library(AUDIOTB_LIB AudioToolbox)
@ -322,7 +331,8 @@ elseif(APPLE)
set(EXTRA_LIBS
${AUDIOUNIT_LIB}
${AUDIOTB_LIB}
${CARBON_LIB})
${CARBON_LIB}
)
elseif(UNIX)
set(QT_LIB) # avoid warning
include_directories(
@ -330,10 +340,12 @@ elseif(UNIX)
${FREETYPE_INCLUDE_DIRS}
)
set(EXTRA_LIBS
${GLU_LIB})
${GLU_LIB}
)
endif()
target_link_libraries(tnzcore
Qt5::OpenGL Qt5::Network
${GL_LIB} ${GLUT_LIB} ${QT_LIB} ${Z_LIB} ${JPEG_LIB} ${LZ4_LIB}
${EXTRA_LIBS})
${EXTRA_LIBS}
)

18
toonz/sources/tnzext/CMakeLists.txt
View file

@ -34,7 +34,8 @@ set(HEADERS
../include/tlin/tlin_matrix.h
../include/tlin/tlin_sparsemat.h
../include/tlin/tlin_superlu_wrap.h
../include/tlin/tlin_vector.h)
../include/tlin/tlin_vector.h
)
set(SOURCES
ContextStatus.cpp
@ -65,7 +66,8 @@ set(SOURCES
plasticskeletondeformation.cpp
ttexturesstorage.cpp
tlin/tlin_cblas_wrap.cpp
tlin/tlin_superlu_wrap.cpp)
tlin/tlin_superlu_wrap.cpp
)
set(OBJCSOURCES
)
@ -101,15 +103,18 @@ if(WIN32)
target_link_libraries(tnzext
Qt5::Core Qt5::Gui Qt5::OpenGL Qt5::Network
${GLUT_LIB} ${GL_LIB} ${SUPERLU_LIB} ${OPENBLAS_LIB} ${EXTRA_LIBS}
tnzcore tnzbase)
tnzcore tnzbase
)
elseif(APPLE)
set(EXTRA_LIBS
${CMAKE_CURRENT_BINARY_DIR}/../tnzcore/libtnzcore.dylib
${CMAKE_CURRENT_BINARY_DIR}/../tnzbase/libtnzbase.dylib)
${CMAKE_CURRENT_BINARY_DIR}/../tnzbase/libtnzbase.dylib
)
target_link_libraries(tnzext
Qt5::Core Qt5::Gui Qt5::OpenGL Qt5::Network
${ACCE_LIB} ${GLUT_LIB} ${GL_LIB} ${SUPERLU_LIB} ${EXTRA_LIBS})
${ACCE_LIB} ${GLUT_LIB} ${GL_LIB} ${SUPERLU_LIB} ${EXTRA_LIBS}
)
elseif(UNIX)
_find_toonz_library(EXTRA_LIBS "tnzcore;tnzbase")
@ -117,5 +122,6 @@ elseif(UNIX)
target_link_libraries(tnzext
Qt5::Core Qt5::Gui Qt5::OpenGL Qt5::Network
${GLUT_LIB} ${GL_LIB} ${SUPERLU_LIB} ${EXTRA_LIBS})
${GLUT_LIB} ${GL_LIB} ${SUPERLU_LIB} ${EXTRA_LIBS}
)
endif()

9
toonz/sources/tnztools/CMakeLists.txt
View file

@ -10,7 +10,8 @@ set(MOC_HEADERS
../include/tools/tooloptions.h
../include/tools/screenpicker.h
rgbpickertool.h
rulertool.h)
rulertool.h
)
set(HEADERS ${MOC_HEADERS}
autofill.h
@ -30,7 +31,8 @@ set(HEADERS ${MOC_HEADERS}
../include/tools/tool.h
../include/tools/toolcommandids.h
../include/tools/toolutils.h
../include/tools/RGBpicker.h)
../include/tools/RGBpicker.h
)
set(SOURCES
autofillpli.cpp
@ -88,7 +90,8 @@ set(SOURCES
strokeselection.cpp
screenpicker.cpp
fingertool.cpp
rulertool.cpp)
rulertool.cpp
)
set(RESOURCES tnztools.qrc)

32
toonz/sources/toonz/CMakeLists.txt
View file

@ -145,7 +145,8 @@ set(MOC_HEADERS
metnum.h
ObjectTracker.h
predict3d.h
processor.h)
processor.h
)
set(HEADERS ${MOC_HEADERS})
@ -301,7 +302,8 @@ set(SOURCES
dummyprocessor.cpp
metnum.cpp
ObjectTracker.cpp
predict3d.cpp)
predict3d.cpp
)
add_translation(toonz ${HEADERS} ${SOURCES})
@ -374,9 +376,11 @@ endif()
if(WIN32)
target_link_libraries(OpenToonz_${VERSION}
Qt5::WinMain Qt5::Core Qt5::Gui Qt5::Network Qt5::OpenGL Qt5::Svg Qt5::Xml Qt5::Script Qt5::Widgets Qt5::PrintSupport Qt5::Multimedia
Qt5::WinMain Qt5::Core Qt5::Gui Qt5::Network Qt5::OpenGL Qt5::Svg Qt5::Xml
Qt5::Script Qt5::Widgets Qt5::PrintSupport Qt5::Multimedia
${GL_LIB} ${GLUT_LIB}
tnzcore tnzbase toonzlib colorfx tnzext image sound toonzqt tnztools tnzstdfx tfarm)
tnzcore tnzbase toonzlib colorfx tnzext image sound toonzqt tnztools tnzstdfx tfarm
)
elseif(APPLE)
find_library(COCOA_LIB Cocoa)
@ -386,7 +390,12 @@ elseif(APPLE)
set(EXTRA_LIBS ${EXTRA_LIBS} "$<TARGET_FILE:tnzstdfx>" "$<TARGET_FILE:tfarm>")
target_link_libraries(OpenToonz_${VERSION} Qt5::Core Qt5::Gui Qt5::Network Qt5::OpenGL Qt5::Svg Qt5::Xml Qt5::Script Qt5::Widgets Qt5::PrintSupport Qt5::Multimedia ${GL_LIB} ${GLUT_LIB} ${COCOA_LIB} ${EXTRA_LIBS} mousedragfilter)
target_link_libraries(OpenToonz_${VERSION}
Qt5::Core Qt5::Gui Qt5::Network Qt5::OpenGL Qt5::Svg Qt5::Xml
Qt5::Script Qt5::Widgets Qt5::PrintSupport Qt5::Multimedia
${GL_LIB} ${GLUT_LIB}
${COCOA_LIB} ${EXTRA_LIBS} mousedragfilter
)
elseif(UNIX)
_find_toonz_library(EXTRA_LIBS "tnzcore;tnzbase;toonzlib;colorfx;tnzext;image;sound;toonzqt;tnztools")
@ -396,7 +405,12 @@ elseif(UNIX)
set(EXTRA_LIBS ${EXTRA_LIBS} ${Boost_LIBRARIES} ${OPENBLAS_LIB})
target_link_libraries(OpenToonz_${VERSION} Qt5::Core Qt5::Gui Qt5::Network Qt5::OpenGL Qt5::Svg Qt5::Xml Qt5::Script Qt5::Widgets Qt5::PrintSupport Qt5::Multimedia ${GL_LIB} ${GLUT_LIB} ${GLU_LIB} ${EXTRA_LIBS})
target_link_libraries(
OpenToonz_${VERSION} Qt5::Core Qt5::Gui Qt5::Network Qt5::OpenGL Qt5::Svg Qt5::Xml
Qt5::Script Qt5::Widgets Qt5::PrintSupport Qt5::Multimedia
${GL_LIB} ${GLUT_LIB} ${GLU_LIB}
${EXTRA_LIBS}
)
endif()
if(APPLE)
@ -423,10 +437,12 @@ if(APPLE)
add_custom_command(TARGET OpenToonz_${VERSION}
POST_BUILD COMMAND
${CMAKE_INSTALL_NAME_TOOL} -add_rpath @executable_path/. ${bin})
${CMAKE_INSTALL_NAME_TOOL} -add_rpath @executable_path/. ${bin}
)
add_custom_command(TARGET OpenToonz_${VERSION}
POST_BUILD COMMAND
${CMAKE_INSTALL_NAME_TOOL} -add_rpath ${CMAKE_INSTALL_RPATH} ${bin})
${CMAKE_INSTALL_NAME_TOOL} -add_rpath ${CMAKE_INSTALL_RPATH} ${bin}
)
add_custom_command(TARGET OpenToonz_${VERSION} POST_BUILD COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/OpenToonz_${VERSION}.app/Contents/Resources)
add_custom_command(TARGET OpenToonz_${VERSION} POST_BUILD COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/OpenToonz_${VERSION}.app/Contents/Resources)

15
toonz/sources/toonzfarm/tfarm/CMakeLists.txt
View file

@ -6,7 +6,8 @@ set(HEADERS
../include/tfarmproxy.h
../../include/tfarmserver.h
../../include/tfarmtask.h
../include/tlog.h)
../include/tlog.h
)
set(SOURCES
service.cpp
@ -18,7 +19,8 @@ set(SOURCES
tfarmtask.cpp
tlog.cpp
ttcpipclient.cpp
ttcpipserver.cpp)
ttcpipserver.cpp
)
add_library(tfarm SHARED ${HEADERS} ${SOURCES})
add_definitions(
@ -39,16 +41,19 @@ include_directories(
if(WIN32)
set(EXTRA_LIBS
tnzcore tnzbase toonzlib
ws2_32.lib)
ws2_32.lib
)
elseif(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)
${CMAKE_CURRENT_BINARY_DIR}/../../toonzlib/libtoonzlib.dylib
)
elseif(UNIX)
_find_toonz_library(EXTRA_LIBS "tnzcore;tnzbase;toonzlib;tnzext")
endif()
target_link_libraries(tfarm
Qt5::Core Qt5::Gui Qt5::OpenGL Qt5::Network
${GLUT_LIB} ${GL_LIB} ${EXTRA_LIBS})
${GLUT_LIB} ${GL_LIB} ${EXTRA_LIBS}
)

6
toonz/sources/toonzfarm/tfarmcontroller/CMakeLists.txt
View file

@ -3,8 +3,10 @@ include_directories(
)
add_executable(tfarmcontroller
tfarmcontroller.cpp)
tfarmcontroller.cpp
)
target_link_libraries(tfarmcontroller
Qt5::Core
tfarm)
tfarm
)

6
toonz/sources/toonzfarm/tfarmserver/CMakeLists.txt
View file

@ -3,8 +3,10 @@ include_directories(
)
add_executable(tfarmserver
tfarmserver.cpp)
tfarmserver.cpp
)
target_link_libraries(tfarmserver
Qt5::Core
tfarm)
tfarm
)

15
toonz/sources/toonzlib/CMakeLists.txt
View file

@ -151,7 +151,8 @@ set(MOC_HEADERS
sandor_fxs/YOMBInputParam.h
sandor_fxs/YOMBParam.h
texturemanager.h
imagebuilders.h)
imagebuilders.h
)
set(HEADERS ${MOC_HEADERS})
@ -308,11 +309,13 @@ set(SOURCES
tbinarizer.cpp
plasticdeformerfx.cpp
txshmeshcolumn.cpp
textureutils.cpp)
textureutils.cpp
)
if(WIN32)
set(SOURCES ${SOURCES}
avicodecrestrictions.cpp)
avicodecrestrictions.cpp
)
endif()
add_translation(toonzlib ${HEADERS} ${SOURCES})
@ -343,13 +346,15 @@ if(WIN32)
target_link_libraries(toonzlib
Qt5::Core Qt5::Gui Qt5::OpenGL Qt5::Script
${GLUT_LIB} ${GL_LIB} vfw32.lib
tnzcore tnzbase tnzext)
tnzcore tnzbase tnzext
)
elseif(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
${USB_LIB})
${USB_LIB}
)
target_link_libraries(toonzlib Qt5::Core Qt5::Gui Qt5::OpenGL Qt5::Script ${GLUT_LIB} ${GL_LIB} ${EXTRA_LIBS})
elseif(UNIX)

12
toonz/sources/toonzqt/CMakeLists.txt
View file

@ -86,7 +86,8 @@ set(MOC_HEADERS
../include/toonzqt/flipconsoleowner.h
../include/toonzqt/combohistogram.h
../include/toonzqt/fxiconmanager.h
pluginhost.h)
pluginhost.h
)
set(HEADERS
${MOC_HEADERS}
@ -95,7 +96,8 @@ set(HEADERS
toonz_plugin.h
plugin_tile_interface.h
plugin_port_interface.h
plugin_fxnode_interface.h)
plugin_fxnode_interface.h
)
set(SOURCES
checkbox.cpp
@ -189,7 +191,8 @@ set(SOURCES
plugin_param_interface.cpp
plugin_param_view_interface.cpp
plugin_ui_page_interface.cpp
toonz_params.cpp)
toonz_params.cpp
)
set(RESOURCES toonzqt.qrc)
@ -226,7 +229,8 @@ _find_toonz_library(EXTRA_LIBS "tnzcore;tnzbase;tnzext;toonzlib;sound")
if(WIN32)
set(EXTRA_LIBS ${EXTRA_LIBS}
advapi32.lib)
advapi32.lib
)
endif()
target_link_libraries(toonzqt Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::OpenGL ${EXTRA_LIBS} ${GL_LIB})