diff --git a/toonz/sources/CMakeLists.txt b/toonz/sources/CMakeLists.txt index 382cb355..a29c4b21 100644 --- a/toonz/sources/CMakeLists.txt +++ b/toonz/sources/CMakeLists.txt @@ -35,7 +35,11 @@ if(WIN32) set(CMAKE_PREFIX_PATH "${QT_PATH}/lib/cmake/") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4251") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4251") - add_definitions(-DVC_EXTRALEAN -DNOMINMAX -D_USE_MATH_DEFINES) + add_definitions( + -DVC_EXTRALEAN + -DNOMINMAX + -D_USE_MATH_DEFINES + ) elseif(APPLE) message("Apple System") if(NOT PLATFORM) @@ -48,7 +52,10 @@ elseif(APPLE) set(CMAKE_PREFIX_PATH "${QT_LIB_PATH}cmake/") message("CMAKE_PREFIX_PATH:" ${CMAKE_PREFIX_PATH}) - add_definitions(-DMACOSX -Di386) + add_definitions( + -DMACOSX + -Di386 + ) 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) @@ -57,7 +64,10 @@ elseif(APPLE) set(CMAKE_PREFIX_PATH "${QT_LIB_PATH}cmake/") message("CMAKE_PREFIX_PATH:" ${CMAKE_PREFIX_PATH}) - add_definitions(-DMACOSX -Di386) + add_definitions( + -DMACOSX + -Di386 + ) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32 -std=c++11 -stdlib=libc++ -fno-implicit-templates -D HAS_QUICKDRAW") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32") set(CMAKE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS} -m32") @@ -89,7 +99,12 @@ else() message(ERROR "Unknown System") endif() -add_definitions(-DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED) +add_definitions( + -DQT_GUI_LIB + -DQT_NETWORK_LIB + -DQT_CORE_LIB + -DQT_SHARED +) # Find includes in corresponding build directories set(CMAKE_INCLUDE_CURRENT_DIR ON) @@ -129,7 +144,9 @@ if(WIN32) ${SDKROOT}/zlib-1.2.8 ${SDKROOT}/LibJPEG/jpeg-9 ) - add_definitions(-DGLUT_NO_LIB_PRAGMA) + add_definitions( + -DGLUT_NO_LIB_PRAGMA + ) endif() get_target_property(QtCore_location Qt5::Core LOCATION) diff --git a/toonz/sources/colorfx/CMakeLists.txt b/toonz/sources/colorfx/CMakeLists.txt index 3df863d6..e73f0fba 100644 --- a/toonz/sources/colorfx/CMakeLists.txt +++ b/toonz/sources/colorfx/CMakeLists.txt @@ -17,7 +17,12 @@ set(SOURCES add_translation(colorfx ${HEADERS} ${SOURCES}) add_library(colorfx SHARED ${HEADERS} ${SOURCES}) -add_definitions(-D _USRDLL -DCOLORFX_EXPORTS -DUSE_MESA) +add_definitions( + -D_USRDLL + -DCOLORFX_EXPORTS + -DUSE_MESA +) + if(APPLE) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-install_name,@rpath/libcolorfx.dylib") endif() diff --git a/toonz/sources/image/CMakeLists.txt b/toonz/sources/image/CMakeLists.txt index cfb56535..e06a79aa 100644 --- a/toonz/sources/image/CMakeLists.txt +++ b/toonz/sources/image/CMakeLists.txt @@ -74,7 +74,12 @@ elseif(UNIX) endif() add_library(image SHARED ${HEADERS} ${SOURCES}) -add_definitions(-DTNZIMAGE_DLL -D_USRDLL -DIMAGE_EXPORTS) +add_definitions( + -DTNZIMAGE_DLL + -D_USRDLL + -DIMAGE_EXPORTS +) + if(APPLE) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-install_name,@rpath/libimage.dylib") endif() diff --git a/toonz/sources/sound/CMakeLists.txt b/toonz/sources/sound/CMakeLists.txt index 3a58356c..77691635 100644 --- a/toonz/sources/sound/CMakeLists.txt +++ b/toonz/sources/sound/CMakeLists.txt @@ -13,7 +13,10 @@ set(SOURCES raw/tsio_raw.cpp) add_library(sound SHARED ${HEADERS} ${SOURCES}) -add_definitions(-DSOUND_EXPORTS) +add_definitions( + -DSOUND_EXPORTS +) + if(APPLE) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-install_name,@rpath/libsound.dylib") endif() diff --git a/toonz/sources/stdfx/CMakeLists.txt b/toonz/sources/stdfx/CMakeLists.txt index 9cf1641d..81a0aac4 100644 --- a/toonz/sources/stdfx/CMakeLists.txt +++ b/toonz/sources/stdfx/CMakeLists.txt @@ -248,7 +248,11 @@ set(OBJCSOURCES ) add_library(tnzstdfx SHARED ${HEADERS} ${SOURCES} ${OBJCSOURCES}) -add_definitions(-D_USRDLL -DTNZSTDFX_EXPORTS) +add_definitions( + -D_USRDLL + -DTNZSTDFX_EXPORTS +) + if(APPLE) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-install_name,@rpath/libtnzstdfx.dylib") endif() diff --git a/toonz/sources/tnzbase/CMakeLists.txt b/toonz/sources/tnzbase/CMakeLists.txt index ce03b712..f326857c 100644 --- a/toonz/sources/tnzbase/CMakeLists.txt +++ b/toonz/sources/tnzbase/CMakeLists.txt @@ -159,7 +159,14 @@ if(APPLE) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-install_name,@rpath/libtnzbase.dylib") endif() -add_definitions(-DTNZBASE_EXPORTS -DTPARAM_EXPORTS -DTXSHEET_EXPORTS -DTFX_EXPORTS -DTAPPTOOLS_EXPORTS -DTTEST_EXPORTS) +add_definitions( + -DTNZBASE_EXPORTS + -DTPARAM_EXPORTS + -DTXSHEET_EXPORTS + -DTFX_EXPORTS + -DTAPPTOOLS_EXPORTS + -DTTEST_EXPORTS +) message("subdir: tnzbase") message("Bin: " ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/toonz/sources/tnzcore/CMakeLists.txt b/toonz/sources/tnzcore/CMakeLists.txt index e0ca6406..f1ccbe9c 100644 --- a/toonz/sources/tnzcore/CMakeLists.txt +++ b/toonz/sources/tnzcore/CMakeLists.txt @@ -272,7 +272,23 @@ if(APPLE) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-install_name,@rpath/libtnzcore.dylib") endif() -add_definitions(-DTNZCORE_EXPORTS -DTCOLOR_EXPORTS -DTGEOMETRY_EXPORTS -DTRASTER_EXPORTS -DTIMAGE_EXPORTS -DTSYSTEM_EXPORTS -DTVECTORIMAGE_EXPORTS -DTGL_EXPORTS -DTSOUND_EXPORTS -DTIMAGE_IO_EXPORTS -DTRASTERIMAGE_EXPORTS -DTVRENDER_EXPORTS -DTFLASH_EXPORTS -DTROP_EXPORTS -DTSTREAM_EXPORTS) +add_definitions( + -DTNZCORE_EXPORTS + -DTCOLOR_EXPORTS + -DTGEOMETRY_EXPORTS + -DTRASTER_EXPORTS + -DTIMAGE_EXPORTS + -DTSYSTEM_EXPORTS + -DTVECTORIMAGE_EXPORTS + -DTGL_EXPORTS + -DTSOUND_EXPORTS + -DTIMAGE_IO_EXPORTS + -DTRASTERIMAGE_EXPORTS + -DTVRENDER_EXPORTS + -DTFLASH_EXPORTS + -DTROP_EXPORTS + -DTSTREAM_EXPORTS +) message("subdir: tnzcore") message("Sources:" ${SOURCES}) diff --git a/toonz/sources/tnzext/CMakeLists.txt b/toonz/sources/tnzext/CMakeLists.txt index 570a5bd3..a930f6b9 100644 --- a/toonz/sources/tnzext/CMakeLists.txt +++ b/toonz/sources/tnzext/CMakeLists.txt @@ -81,7 +81,9 @@ if(APPLE) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-install_name,@rpath/libtnzext.dylib") endif() -add_definitions(-DTNZEXT_EXPORTS) +add_definitions( + -DTNZEXT_EXPORTS +) message("subdir: tnzext") message("Bin: " ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/toonz/sources/tnztools/CMakeLists.txt b/toonz/sources/tnztools/CMakeLists.txt index d4ab5fb1..ae100a99 100644 --- a/toonz/sources/tnztools/CMakeLists.txt +++ b/toonz/sources/tnztools/CMakeLists.txt @@ -99,7 +99,9 @@ add_translation(tnztools ${HEADERS} ${SOURCES}) qt5_wrap_cpp(SOURCES ${MOC_HEADERS}) add_library(tnztools SHARED ${HEADERS} ${SOURCES} ${RESOURCES}) -add_definitions(-DTNZTOOLS_EXPORTS) +add_definitions( + -DTNZTOOLS_EXPORTS +) if(APPLE) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-install_name,@rpath/libtnztools.dylib") diff --git a/toonz/sources/toonz/CMakeLists.txt b/toonz/sources/toonz/CMakeLists.txt index c5ff1d4e..052c856b 100644 --- a/toonz/sources/toonz/CMakeLists.txt +++ b/toonz/sources/toonz/CMakeLists.txt @@ -326,11 +326,21 @@ else() set(MACOSX_BUNDLE_ICON_FILE "OpenToonz.icns") set_source_files_properties(OpenToonz.icns PROPERTIES MACOSX_PACKAGE_LOCATION "Resources") add_executable(OpenToonz_${VERSION} MACOSX_BUNDLE OpenToonz.icns ${HEADERS} ${SOURCES} ${OBJCSOURCES} ${RESOURCES}) - #add_definitions(-DTNZBASE_EXPORTS -DTPARAM_EXPORTS -DTXSHEET_EXPORTS -DTFX_EXPORTS -DTAPPTOOLS_EXPORTS -DTTEST_EXPORTS) + #add_definitions( + # -DTNZBASE_EXPORTS + # -DTPARAM_EXPORTS + # -DTXSHEET_EXPORTS + # -DTFX_EXPORTS + # -DTAPPTOOLS_EXPORTS + # -DTTEST_EXPORTS + #) endif() if(WIN32) - add_definitions(-DUNICODE -D_UNICODE) + add_definitions( + -DUNICODE + -D_UNICODE + ) endif() message("subdir: toonz") diff --git a/toonz/sources/toonzfarm/tfarm/CMakeLists.txt b/toonz/sources/toonzfarm/tfarm/CMakeLists.txt index f181f5cd..b0f2ca0d 100644 --- a/toonz/sources/toonzfarm/tfarm/CMakeLists.txt +++ b/toonz/sources/toonzfarm/tfarm/CMakeLists.txt @@ -21,7 +21,10 @@ set(SOURCES ttcpipserver.cpp) add_library(tfarm SHARED ${HEADERS} ${SOURCES}) -add_definitions(-DTFARM_EXPORTS) +add_definitions( + -DTFARM_EXPORTS +) + if(APPLE) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-install_name,@rpath/libtfarm.dylib") endif() diff --git a/toonz/sources/toonzlib/CMakeLists.txt b/toonz/sources/toonzlib/CMakeLists.txt index 74bd6c8d..64a5fe43 100644 --- a/toonz/sources/toonzlib/CMakeLists.txt +++ b/toonz/sources/toonzlib/CMakeLists.txt @@ -324,7 +324,9 @@ if(APPLE) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-install_name,@rpath/libtoonzlib.dylib") endif() -add_definitions(-DTOONZLIB_EXPORTS) +add_definitions( + -DTOONZLIB_EXPORTS +) message("subdir: toonzlib") message("Bin: " ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/toonz/sources/toonzqt/CMakeLists.txt b/toonz/sources/toonzqt/CMakeLists.txt index fb80b0d2..4a7d31e9 100644 --- a/toonz/sources/toonzqt/CMakeLists.txt +++ b/toonz/sources/toonzqt/CMakeLists.txt @@ -213,7 +213,10 @@ if(APPLE) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-install_name,@rpath/libtoonzqt.dylib") endif() -add_definitions(-DQT_WIDGETS_LIB -DTOONZQT_EXPORTS) +add_definitions( + -DQT_WIDGETS_LIB + -DTOONZQT_EXPORTS +) message("subdir: toonzqt") message("type:" ${CMAKE_SHARED_LIBRARY_SUFFIX})