diff --git a/thirdparty/lzo/driver/CMakeLists.txt b/thirdparty/lzo/driver/CMakeLists.txt index 122a223e..8bc72968 100644 --- a/thirdparty/lzo/driver/CMakeLists.txt +++ b/thirdparty/lzo/driver/CMakeLists.txt @@ -23,3 +23,10 @@ else() target_link_libraries(lzodecompress ${LZO_LIBRARY}) endif() set(LZODRIVER_FOUND true PARENT_SCOPE) + +install( + TARGETS + lzocompress + lzodecompress + DESTINATION bin +) diff --git a/toonz/sources/CMakeLists.txt b/toonz/sources/CMakeLists.txt index 7cf3d7c5..e20931df 100644 --- a/toonz/sources/CMakeLists.txt +++ b/toonz/sources/CMakeLists.txt @@ -232,6 +232,9 @@ if(BUILD_ENV_APPLE) endif() endif() +set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/opentoonz") +set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + include_directories( include ) @@ -561,8 +564,8 @@ elseif(BUILD_ENV_UNIXLIKE) # Mirror relative bin/lib location for installation # so the generated shell script works in both cases. - set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/opentoonz) - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/opentoonz) + set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}/opentoonz) + set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}/opentoonz) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) diff --git a/toonz/sources/colorfx/CMakeLists.txt b/toonz/sources/colorfx/CMakeLists.txt index d9c43c86..561acd85 100644 --- a/toonz/sources/colorfx/CMakeLists.txt +++ b/toonz/sources/colorfx/CMakeLists.txt @@ -41,3 +41,9 @@ _find_toonz_library(EXTRA_LIBS "tnzcore;tnzbase") message("FIND_FILE:" ${EXTRA_LIBS}) target_link_libraries(colorfx Qt5::Core ${GL_LIB} ${EXTRA_LIBS}) + +install( + TARGETS + colorfx + DESTINATION lib${LIB_SUFFIX}/opentoonz +) diff --git a/toonz/sources/image/CMakeLists.txt b/toonz/sources/image/CMakeLists.txt index 9c5c9f18..294888db 100644 --- a/toonz/sources/image/CMakeLists.txt +++ b/toonz/sources/image/CMakeLists.txt @@ -186,3 +186,9 @@ elseif(BUILD_ENV_UNIXLIKE) endif() target_link_libraries(image Qt5::Core Qt5::Gui Qt5::Network ${Z_LIB} ${GLUT_LIB} ${GL_LIB} ${JPEG_LIB} ${TIFF_LIB} ${PNG_LIB} ${EXTRA_LIBS}) + +install( + TARGETS + image + DESTINATION lib${LIB_SUFFIX}/opentoonz +) diff --git a/toonz/sources/sound/CMakeLists.txt b/toonz/sources/sound/CMakeLists.txt index f2a5cece..ec58d8d1 100644 --- a/toonz/sources/sound/CMakeLists.txt +++ b/toonz/sources/sound/CMakeLists.txt @@ -34,3 +34,9 @@ _find_toonz_library(EXTRA_LIBS "tnzcore;tnzbase;toonzlib") message("ToonzCore: " ${EXTRA_LIBS}) target_link_libraries(sound Qt5::Core ${EXTRA_LIBS}) + +install( + TARGETS + sound + DESTINATION lib${LIB_SUFFIX}/opentoonz +) diff --git a/toonz/sources/stdfx/CMakeLists.txt b/toonz/sources/stdfx/CMakeLists.txt index ac4c7020..10635b9a 100644 --- a/toonz/sources/stdfx/CMakeLists.txt +++ b/toonz/sources/stdfx/CMakeLists.txt @@ -318,3 +318,9 @@ target_link_libraries(tnzstdfx Qt5::Core Qt5::Gui Qt5::OpenGL ${GL_LIB} ${GLEW_L if(OpenCV_FOUND) target_link_libraries(tnzstdfx ${OpenCV_LIBS}) endif() + +install( + TARGETS + tnzstdfx + DESTINATION lib${LIB_SUFFIX}/opentoonz +) diff --git a/toonz/sources/t32bitsrv/CMakeLists.txt b/toonz/sources/t32bitsrv/CMakeLists.txt index 42076a52..51c591c4 100644 --- a/toonz/sources/t32bitsrv/CMakeLists.txt +++ b/toonz/sources/t32bitsrv/CMakeLists.txt @@ -38,3 +38,9 @@ if(BUILD_ENV_APPLE AND PLATFORM EQUAL 32) ${CMAKE_INSTALL_NAME_TOOL} -add_rpath @executable_path/. ${bin} ) endif() + +install( + TARGETS + t32bitsrv + DESTINATION bin +) diff --git a/toonz/sources/tcleanupper/CMakeLists.txt b/toonz/sources/tcleanupper/CMakeLists.txt index 541bd9f7..7b78600f 100644 --- a/toonz/sources/tcleanupper/CMakeLists.txt +++ b/toonz/sources/tcleanupper/CMakeLists.txt @@ -8,3 +8,9 @@ target_link_libraries(tcleanup tfarm image ) + +install( + TARGETS + tcleanup + DESTINATION bin +) diff --git a/toonz/sources/tcomposer/CMakeLists.txt b/toonz/sources/tcomposer/CMakeLists.txt index 8e33bf94..26a73c27 100644 --- a/toonz/sources/tcomposer/CMakeLists.txt +++ b/toonz/sources/tcomposer/CMakeLists.txt @@ -14,3 +14,9 @@ target_link_libraries(tcomposer colorfx toonzqt ) + +install( + TARGETS + tcomposer + DESTINATION bin +) diff --git a/toonz/sources/tconverter/CMakeLists.txt b/toonz/sources/tconverter/CMakeLists.txt index 0d51f0ca..524e9438 100644 --- a/toonz/sources/tconverter/CMakeLists.txt +++ b/toonz/sources/tconverter/CMakeLists.txt @@ -7,3 +7,9 @@ target_link_libraries(tconverter toonzlib image ) + +install( + TARGETS + tconverter + DESTINATION bin +) diff --git a/toonz/sources/tnzbase/CMakeLists.txt b/toonz/sources/tnzbase/CMakeLists.txt index 23004d33..263550bc 100644 --- a/toonz/sources/tnzbase/CMakeLists.txt +++ b/toonz/sources/tnzbase/CMakeLists.txt @@ -209,3 +209,9 @@ elseif(BUILD_ENV_UNIXLIKE) endif() target_link_libraries(tnzbase Qt5::Core Qt5::Gui ${EXTRA_LIBS}) + +install( + TARGETS + tnzbase + DESTINATION lib${LIB_SUFFIX}/opentoonz +) diff --git a/toonz/sources/tnzcore/CMakeLists.txt b/toonz/sources/tnzcore/CMakeLists.txt index c34f3aa8..a3f7cd1f 100644 --- a/toonz/sources/tnzcore/CMakeLists.txt +++ b/toonz/sources/tnzcore/CMakeLists.txt @@ -358,3 +358,9 @@ target_link_libraries(tnzcore ${GL_LIB} ${GLUT_LIB} ${QT_LIB} ${Z_LIB} ${JPEG_LIB} ${LZ4_LIB} ${EXTRA_LIBS} ) + +install( + TARGETS + tnzcore + DESTINATION lib${LIB_SUFFIX}/opentoonz +) diff --git a/toonz/sources/tnzext/CMakeLists.txt b/toonz/sources/tnzext/CMakeLists.txt index bd1eeded..f387a8db 100644 --- a/toonz/sources/tnzext/CMakeLists.txt +++ b/toonz/sources/tnzext/CMakeLists.txt @@ -133,3 +133,9 @@ elseif(BUILD_ENV_UNIXLIKE) ${GLUT_LIB} ${GL_LIB} ${SUPERLU_LIB} ${OPENBLAS_LIB} ${EXTRA_LIBS} ) endif() + +install( + TARGETS + tnzext + DESTINATION lib${LIB_SUFFIX}/opentoonz +) diff --git a/toonz/sources/tnztools/CMakeLists.txt b/toonz/sources/tnztools/CMakeLists.txt index e6bfa704..04350d8a 100644 --- a/toonz/sources/tnztools/CMakeLists.txt +++ b/toonz/sources/tnztools/CMakeLists.txt @@ -139,3 +139,9 @@ include_directories( _find_toonz_library(EXTRA_LIBS "tnzcore;tnzbase;tnzext;toonzlib;toonzqt") target_link_libraries(tnztools Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::OpenGL ${GLUT_LIB} ${EXTRA_LIBS} ${GL_LIB} ${MYPAINT_LIB_LDFLAGS}) + +install( + TARGETS + tnztools + DESTINATION lib${LIB_SUFFIX}/opentoonz +) diff --git a/toonz/sources/toonz/CMakeLists.txt b/toonz/sources/toonz/CMakeLists.txt index 57407ca1..1b77685e 100644 --- a/toonz/sources/toonz/CMakeLists.txt +++ b/toonz/sources/toonz/CMakeLists.txt @@ -674,8 +674,6 @@ TOONZSTUDIOPALETTE=\"\$HOME/.config/OpenToonz/stuff/studiopalette\" EOF fi -export LD_LIBRARY_PATH=\${OPENTOONZ_BASE}/lib/opentoonz:\${LD_LIBRARY_PATH} - exec \$OPENTOONZ_BASE/bin/OpenToonz \"\$@\" ") # only needed for executing without installing @@ -684,39 +682,9 @@ exec \$OPENTOONZ_BASE/bin/OpenToonz \"\$@\" install( PROGRAMS ${CMAKE_BINARY_DIR}/bin/opentoonz - "$" - "$" - "$" - "$" - "$" DESTINATION bin ) - if(LZODRIVER_FOUND) - install( - PROGRAMS - "$" - "$" - DESTINATION bin - ) - endif() - - install( - FILES - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - "$" - DESTINATION lib/opentoonz - ) - install( DIRECTORY ${CMAKE_SOURCE_DIR}/../../stuff diff --git a/toonz/sources/toonzfarm/tfarm/CMakeLists.txt b/toonz/sources/toonzfarm/tfarm/CMakeLists.txt index ddcc963c..f751dc4a 100644 --- a/toonz/sources/toonzfarm/tfarm/CMakeLists.txt +++ b/toonz/sources/toonzfarm/tfarm/CMakeLists.txt @@ -60,3 +60,9 @@ target_link_libraries(tfarm Qt5::Core Qt5::Gui Qt5::OpenGL Qt5::Network ${GLUT_LIB} ${GL_LIB} ${EXTRA_LIBS} ) + +install( + TARGETS + tfarm + DESTINATION lib${LIB_SUFFIX}/opentoonz +) diff --git a/toonz/sources/toonzfarm/tfarmcontroller/CMakeLists.txt b/toonz/sources/toonzfarm/tfarmcontroller/CMakeLists.txt index ca9e700b..9cc1997e 100644 --- a/toonz/sources/toonzfarm/tfarmcontroller/CMakeLists.txt +++ b/toonz/sources/toonzfarm/tfarmcontroller/CMakeLists.txt @@ -10,3 +10,9 @@ target_link_libraries(tfarmcontroller Qt5::Core tfarm ) + +install( + TARGETS + tfarmcontroller + DESTINATION bin +) diff --git a/toonz/sources/toonzfarm/tfarmserver/CMakeLists.txt b/toonz/sources/toonzfarm/tfarmserver/CMakeLists.txt index d4168e65..609b243d 100644 --- a/toonz/sources/toonzfarm/tfarmserver/CMakeLists.txt +++ b/toonz/sources/toonzfarm/tfarmserver/CMakeLists.txt @@ -10,3 +10,9 @@ target_link_libraries(tfarmserver Qt5::Core tfarm ) + +install( + TARGETS + tfarmserver + DESTINATION bin +) diff --git a/toonz/sources/toonzlib/CMakeLists.txt b/toonz/sources/toonzlib/CMakeLists.txt index e382fee8..40aa2e70 100644 --- a/toonz/sources/toonzlib/CMakeLists.txt +++ b/toonz/sources/toonzlib/CMakeLists.txt @@ -387,3 +387,9 @@ elseif(BUILD_ENV_UNIXLIKE) target_link_libraries(toonzlib Qt5::Core Qt5::Gui Qt5::OpenGL Qt5::Script Qt5::Multimedia ${GLUT_LIB} ${GL_LIB} ${GLEW_LIB} ${EXTRA_LIBS} ${MYPAINT_LIB_LDFLAGS}) endif() + +install( + TARGETS + toonzlib + DESTINATION lib${LIB_SUFFIX}/opentoonz +) diff --git a/toonz/sources/toonzqt/CMakeLists.txt b/toonz/sources/toonzqt/CMakeLists.txt index eb8536a9..c74573b5 100644 --- a/toonz/sources/toonzqt/CMakeLists.txt +++ b/toonz/sources/toonzqt/CMakeLists.txt @@ -249,3 +249,9 @@ elseif(BUILD_ENV_UNIXLIKE) endif() target_link_libraries(toonzqt Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::OpenGL Qt5::Svg ${EXTRA_LIBS} ${GL_LIB}) + +install( + TARGETS + toonzqt + DESTINATION lib${LIB_SUFFIX}/opentoonz +)