Skip to content

Add Carla support for MacOS #4558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tresf merged 20 commits into from
Sep 15, 2018
Merged

Add Carla support for MacOS #4558

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
4d99f7e
Add Carla support for MacOS
tresf Aug 27, 2018
d4d86f1
Update .gitmodules
tresf Aug 27, 2018
d2e3728
Update BuildPlugin.cmake
tresf Aug 27, 2018
0c4ea23
Update CarlaPkgConfig.cmake
tresf Aug 27, 2018
4720ed8
Update CarlaPkgConfig.cmake
tresf Aug 27, 2018
e576229
Move carla to homebrew, remove submodule
tresf Aug 28, 2018
0a7740b
Remove dylib from bundle
tresf Aug 28, 2018
8119462
Fix linking
tresf Aug 28, 2018
5f4af04
Better commenting, fix cmake version detection
tresf Aug 30, 2018
ece0c67
Whitespace removal
tresf Aug 30, 2018
f640b8e
Simplify SHARED linking logic
tresf Aug 30, 2018
73a2add
Don't hard-code carla path
tresf Sep 12, 2018
38e48c0
Nudge to latest Carla
tresf Sep 14, 2018
ee6d502
More scalable relinking
tresf Sep 14, 2018
b38dd02
Add old carla lib fallback
tresf Sep 14, 2018
e89aee5
Bump to homebrew carla; minor formatting
tresf Sep 14, 2018
a5a9a15
Fix header on 1.9.9 and older
tresf Sep 14, 2018
79a5367
Use header definitions if avail
tresf Sep 14, 2018
94c747c
Fix more missing headers
tresf Sep 14, 2018
0838c9b
Uglify :D
tresf Sep 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update CarlaPkgConfig.cmake
  • Loading branch information
@tresf
tresf authored Aug 27, 2018
commit 4720ed840612453f21d74761a92bdf9038748732
3 changes: 1 addition & 2 deletions cmake/modules/CarlaPkgConfig.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ SET(CARLA_PKGCONFIG_FILE ${CARLA_SUBMODULE_SOURCE}/data/carla-standalone.pc)

# Look for carla-standalone pkg-config file
IF(EXISTS ${CARLA_PKGCONFIG_FILE})
SET(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH};${CMAKE_BINARY_DIR}")
SET(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${CMAKE_BINARY_DIR}")
FILE(READ ${CARLA_PKGCONFIG_FILE} CARLA_PKGCONFIG_TEXT)
# add source/includes to include location
STRING(REPLACE "X-INCLUDEDIR-X/carla" "${CARLA_SUBMODULE_SOURCE}/source/includes" CARLA_PKGCONFIG_TEXT "${CARLA_PKGCONFIG_TEXT}")
Expand All @@ -16,6 +16,5 @@ IF(EXISTS ${CARLA_PKGCONFIG_FILE})
STRING(REPLACE "X-LIBDIR-X/carla" "/Applications/Carla.app/Contents/MacOS" CARLA_PKGCONFIG_TEXT "${CARLA_PKGCONFIG_TEXT}")
ENDIF()
FILE(WRITE "${CMAKE_BINARY_DIR}/carla-standalone.pc" "${CARLA_PKGCONFIG_TEXT}")
SET(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${CMAKE_BINARY_DIR}")
MESSAGE("-- Using carla headers from ${CARLA_SUBMODULE_SOURCE}/source/includes")
ENDIF()