Skip to content

Commit f0fed51

Browse files
committed
cmake: MacOSX .app bundler is now working :D
1 parent 0b034f3 commit f0fed51

File tree

6 files changed

+10
-2
lines changed

6 files changed

+10
-2
lines changed
File renamed without changes.

applications/kaliscope_qt/src/CMakeLists.txt

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ SET( MY_APP_NAME "Kaliscope" )
33
# external modules
44
include(UseMvpPlayerBoost)
55
include(FindFMod)
6+
include(FindTuttleHost)
67
FIND_PACKAGE(Qt5 COMPONENTS Core Gui Widgets OpenGL )
78
set(CMAKE_AUTOMOC ON)
89

@@ -31,7 +32,7 @@ elseif(WIN32)
3132
endif()
3233

3334
ADD_EXECUTABLE( ${MY_APP_NAME} MACOSX_BUNDLE WIN32 ${KALISCOPE_SRCS} ${COPY_RESOURCES} )
34-
TARGET_LINK_LIBRARIES( ${MY_APP_NAME} ${Boost_LIBRARIES} ${QT_LIBRARIES} boostAdds-shared mvpPlayerCore-shared mvpPlayerNet-shared mvpPlayerFMod-shared mvpPlayerGui-shared mvpPlayerQtGui-shared kaliCore-shared Qt5::Core Qt5::Gui Qt5::Widgets Qt5::OpenGL )
35+
TARGET_LINK_LIBRARIES( ${MY_APP_NAME} ${Boost_LIBRARIES} ${QT_LIBRARIES} ${TUTTLE_HOST_LIBRARIES} boostAdds-shared mvpPlayerCore-shared mvpPlayerNet-shared mvpPlayerFMod-shared mvpPlayerGui-shared mvpPlayerQtGui-shared kaliCore-shared Qt5::Core Qt5::Gui Qt5::Widgets Qt5::OpenGL )
3536

3637
# Install stuff
3738
SET( qt_plugin_dest_dir bin )
@@ -116,6 +117,13 @@ IF(APPLE)
116117
PATTERN "*.ui"
117118
)
118119

120+
INSTALL( DIRECTORY "${PROJECT_SOURCE_DIR}/presets"
121+
DESTINATION ${INSTALL_CMAKE_DIR}
122+
COMPONENT Runtime
123+
FILES_MATCHING
124+
PATTERN "*.json"
125+
)
126+
119127
FILE( GLOB_RECURSE KALISCOPE_PLUGINS
120128
"${plugin_dest_dir}/*${CMAKE_SHARED_LIBRARY_SUFFIX}" )
121129

@@ -134,7 +142,7 @@ IF(APPLE)
134142
" COMPONENT Runtime
135143
)
136144

137-
SET( DIRS "${Boost_LIBRARY_DIR};${CMAKE_INSTALL_PREFIX}/lib;${FMOD_LIBRARY_DIR}" )
145+
SET( DIRS "${Boost_LIBRARY_DIR};${CMAKE_INSTALL_PREFIX}/lib;${FMOD_LIBRARY_DIR};${TUTTLE_HOST_LIBRARY_DIR}" )
138146

139147
INSTALL(CODE "
140148
INCLUDE(BundleUtilities)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)