fix bug: lzodriver should be bundled

Emasoft · Apr 19, 2016 · 1a50d4d · 1a50d4d
1 parent 6c9449a
commit 1a50d4d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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 $<TARGET_FILE:lzocompress> ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} DEPENDS lzocompress)
     add_custom_command(TARGET OpenToonz_${VERSION} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:lzodecompress> ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} DEPENDS lzodecompress)
 endif()