Add add_dependencies Command to CMake for OSX (#1587)
* fix cmake for osx * try using make -j 2 for osx travis * obtain qt5.9.2 from the previous homebrew
This commit is contained in:
parent
79662fa9d2
commit
5a2ff6d279
13 changed files with 17 additions and 4 deletions
|
@ -7,4 +7,4 @@ cmake ../sources \
|
||||||
-DQT_PATH=/usr/local/Cellar/qt/5.9.2/lib/ \
|
-DQT_PATH=/usr/local/Cellar/qt/5.9.2/lib/ \
|
||||||
-DTIFF_INCLUDE_DIR=../../thirdparty/tiff-4.0.3/libtiff/ \
|
-DTIFF_INCLUDE_DIR=../../thirdparty/tiff-4.0.3/libtiff/ \
|
||||||
-DSUPERLU_INCLUDE_DIR=../../thirdparty/superlu/SuperLU_4.1/include/
|
-DSUPERLU_INCLUDE_DIR=../../thirdparty/superlu/SuperLU_4.1/include/
|
||||||
make
|
make -j 2
|
||||||
|
|
|
@ -1,5 +1,8 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
brew update
|
brew update
|
||||||
brew install glew lz4 lzo libusb libmypaint qt
|
brew install glew lz4 lzo libusb libmypaint
|
||||||
brew tap tcr/tcr
|
brew tap tcr/tcr
|
||||||
brew install clang-format
|
brew install clang-format
|
||||||
|
# obtain qt5.9.2 from the previous version of the formula
|
||||||
|
curl -O https://raw.githubusercontent.com/Homebrew/homebrew-core/9bc1bdd8d26747cffd7a18c31975f86cd0a97bc3/Formula/qt.rb
|
||||||
|
brew install ./qt.rb
|
|
@ -27,6 +27,7 @@ add_definitions(
|
||||||
|
|
||||||
if(BUILD_ENV_APPLE)
|
if(BUILD_ENV_APPLE)
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-install_name,@rpath/libcolorfx.dylib")
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-install_name,@rpath/libcolorfx.dylib")
|
||||||
|
add_dependencies(colorfx tnzcore tnzbase)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
message("subdir: colorfx")
|
message("subdir: colorfx")
|
||||||
|
|
|
@ -100,6 +100,7 @@ add_definitions(
|
||||||
|
|
||||||
if(BUILD_ENV_APPLE)
|
if(BUILD_ENV_APPLE)
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-install_name,@rpath/libimage.dylib")
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-install_name,@rpath/libimage.dylib")
|
||||||
|
add_dependencies(image tnzcore tnzbase toonzlib)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
message("subdir: image")
|
message("subdir: image")
|
||||||
|
|
|
@ -23,6 +23,7 @@ add_definitions(
|
||||||
|
|
||||||
if(BUILD_ENV_APPLE)
|
if(BUILD_ENV_APPLE)
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-install_name,@rpath/libsound.dylib")
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-install_name,@rpath/libsound.dylib")
|
||||||
|
add_dependencies(sound tnzcore tnzbase toonzlib)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
message("subdir: sound")
|
message("subdir: sound")
|
||||||
|
|
|
@ -267,6 +267,7 @@ add_definitions(
|
||||||
|
|
||||||
if(BUILD_ENV_APPLE)
|
if(BUILD_ENV_APPLE)
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-install_name,@rpath/libtnzstdfx.dylib")
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-install_name,@rpath/libtnzstdfx.dylib")
|
||||||
|
add_dependencies(tnzstdfx tnzcore tnzbase toonzlib)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
message("subdir: tnzstdfx")
|
message("subdir: tnzstdfx")
|
||||||
|
|
|
@ -166,6 +166,7 @@ add_library(tnzbase SHARED ${HEADERS} ${SOURCES} ${OBJCSOURCES})
|
||||||
|
|
||||||
if(BUILD_ENV_APPLE)
|
if(BUILD_ENV_APPLE)
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-install_name,@rpath/libtnzbase.dylib")
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-install_name,@rpath/libtnzbase.dylib")
|
||||||
|
add_dependencies(tnzbase tnzcore)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_definitions(
|
add_definitions(
|
||||||
|
|
|
@ -81,6 +81,7 @@ add_library(tnzext SHARED ${HEADERS} ${SOURCES} ${OBJCSOURCES})
|
||||||
|
|
||||||
if(BUILD_ENV_APPLE)
|
if(BUILD_ENV_APPLE)
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-install_name,@rpath/libtnzext.dylib")
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-install_name,@rpath/libtnzext.dylib")
|
||||||
|
add_dependencies(tnzext tnzcore tnzbase)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_definitions(
|
add_definitions(
|
||||||
|
|
|
@ -111,6 +111,7 @@ add_definitions(
|
||||||
|
|
||||||
if(BUILD_ENV_APPLE)
|
if(BUILD_ENV_APPLE)
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-install_name,@rpath/libtnztools.dylib")
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-install_name,@rpath/libtnztools.dylib")
|
||||||
|
add_dependencies(tnztools tnzcore tnzbase tnzext toonzlib toonzqt)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
message("subdir: tnztools")
|
message("subdir: tnztools")
|
||||||
|
|
|
@ -416,6 +416,7 @@ elseif(BUILD_ENV_APPLE)
|
||||||
# 変なところにライブラリ生成するカスども
|
# 変なところにライブラリ生成するカスども
|
||||||
set(EXTRA_LIBS ${EXTRA_LIBS} "$<TARGET_FILE:tnzstdfx>" "$<TARGET_FILE:tfarm>")
|
set(EXTRA_LIBS ${EXTRA_LIBS} "$<TARGET_FILE:tnzstdfx>" "$<TARGET_FILE:tfarm>")
|
||||||
|
|
||||||
|
add_dependencies(OpenToonz_${VERSION} tnzcore tnzbase toonzlib colorfx tnzext image sound toonzqt tnztools tnzstdfx tfarm)
|
||||||
|
|
||||||
target_link_libraries(OpenToonz_${VERSION}
|
target_link_libraries(OpenToonz_${VERSION}
|
||||||
Qt5::Core Qt5::Gui Qt5::Network Qt5::OpenGL Qt5::Svg Qt5::Xml
|
Qt5::Core Qt5::Gui Qt5::Network Qt5::OpenGL Qt5::Svg Qt5::Xml
|
||||||
|
|
|
@ -49,13 +49,13 @@ elseif(BUILD_ENV_APPLE)
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/../../tnzbase/libtnzbase.dylib
|
${CMAKE_CURRENT_BINARY_DIR}/../../tnzbase/libtnzbase.dylib
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/../../toonzlib/libtoonzlib.dylib
|
${CMAKE_CURRENT_BINARY_DIR}/../../toonzlib/libtoonzlib.dylib
|
||||||
)
|
)
|
||||||
|
add_dependencies(tfarm tnzcore tnzbase toonzlib tnzext)
|
||||||
elseif(BUILD_ENV_UNIXLIKE)
|
elseif(BUILD_ENV_UNIXLIKE)
|
||||||
_find_toonz_library(EXTRA_LIBS "tnzcore;tnzbase;toonzlib;tnzext")
|
_find_toonz_library(EXTRA_LIBS "tnzcore;tnzbase;toonzlib;tnzext")
|
||||||
if(BUILD_TARGET_WIN)
|
if(BUILD_TARGET_WIN)
|
||||||
set(EXTRA_LIBS ${EXTRA_LIBS} -lws2_32)
|
set(EXTRA_LIBS ${EXTRA_LIBS} -lws2_32)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
target_link_libraries(tfarm
|
target_link_libraries(tfarm
|
||||||
Qt5::Core Qt5::Gui Qt5::OpenGL Qt5::Network
|
Qt5::Core Qt5::Gui Qt5::OpenGL Qt5::Network
|
||||||
${GLUT_LIB} ${GL_LIB} ${EXTRA_LIBS}
|
${GLUT_LIB} ${GL_LIB} ${EXTRA_LIBS}
|
||||||
|
|
|
@ -332,6 +332,7 @@ qt5_wrap_cpp(SOURCES ${MOC_HEADERS})
|
||||||
add_library(toonzlib SHARED ${HEADERS} ${SOURCES})
|
add_library(toonzlib SHARED ${HEADERS} ${SOURCES})
|
||||||
if(BUILD_ENV_APPLE)
|
if(BUILD_ENV_APPLE)
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-install_name,@rpath/libtoonzlib.dylib")
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-install_name,@rpath/libtoonzlib.dylib")
|
||||||
|
add_dependencies(toonzlib tnzcore tnzbase tnzext)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_definitions(
|
add_definitions(
|
||||||
|
|
|
@ -215,6 +215,7 @@ qt5_wrap_cpp(SOURCES ${MOC_HEADERS} OPTIONS ${incs})
|
||||||
add_library(toonzqt SHARED ${HEADERS} ${SOURCES} ${RESOURCES})
|
add_library(toonzqt SHARED ${HEADERS} ${SOURCES} ${RESOURCES})
|
||||||
if(BUILD_ENV_APPLE)
|
if(BUILD_ENV_APPLE)
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-install_name,@rpath/libtoonzqt.dylib")
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-install_name,@rpath/libtoonzqt.dylib")
|
||||||
|
add_dependencies(toonzqt tnzcore tnzbase tnzext toonzlib sound)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_definitions(
|
add_definitions(
|
||||||
|
|
Loading…
Reference in a new issue