From 1a50d4d9ffeb964cddcc6f13322b7508eaf6afaf Mon Sep 17 00:00:00 2001 From: Keisuke Ogaki Date: Apr 19 2016 13:51:34 +0000 Subject: fix bug: lzodriver should be bundled --- diff --git a/thirdparty/lzo/driver/CMakeLists.txt b/thirdparty/lzo/driver/CMakeLists.txt index df9a758..f83d573 100644 --- a/thirdparty/lzo/driver/CMakeLists.txt +++ b/thirdparty/lzo/driver/CMakeLists.txt @@ -22,3 +22,4 @@ else () target_link_libraries(lzocompress ${LZO_LIBRARY}) target_link_libraries(lzodecompress ${LZO_LIBRARY}) endif() +set(LZODRIVER_FOUND true PARENT_SCOPE) diff --git a/toonz/sources/CMakeLists.txt b/toonz/sources/CMakeLists.txt index ef90216..2291edc 100644 --- a/toonz/sources/CMakeLists.txt +++ b/toonz/sources/CMakeLists.txt @@ -237,10 +237,10 @@ add_subdirectory(colorfx) add_subdirectory(image) add_subdirectory(toonzqt) add_subdirectory(tnztools) -add_subdirectory(toonz) add_subdirectory(${SDKROOT}/lzo/driver lzodriver) +add_subdirectory(toonz) add_subdirectory(tcleanupper) add_subdirectory(tcomposer) add_subdirectory(tconverter) diff --git a/toonz/sources/toonz/CMakeLists.txt b/toonz/sources/toonz/CMakeLists.txt index ba14c23..24093f9 100644 --- a/toonz/sources/toonz/CMakeLists.txt +++ b/toonz/sources/toonz/CMakeLists.txt @@ -377,7 +377,7 @@ if (APPLE) endif() # copy utilty executables onto the directory after build -if(LZODRIVER-FOUND) +if(LZODRIVER_FOUND) add_custom_command(TARGET OpenToonz_${VERSION} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $ ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} DEPENDS lzocompress) add_custom_command(TARGET OpenToonz_${VERSION} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $ ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} DEPENDS lzodecompress) endif()