Skip to content

Commit 3ba2600

Browse files
committed
Build - remove Erlang headers - these are now in the external subprojects sp_midi and sp_link
1 parent ecdc840 commit 3ba2600

25 files changed

+0
-6830
lines changed

app/external/CMakeLists.txt

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,8 @@ message(STATUS "Externals Builder")
55

66
project(ExternalsBuilder)
77

8-
if(WIN32)
9-
set(ERLANG_INCLUDE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../prebuilt/windows/headers/erlang CACHE STRING "Path to the Erlang header files")
10-
elseif(${CMAKE_SYSTEM_NAME} MATCHES Darwin) # macOS
11-
set(ERLANG_INCLUDE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../prebuilt/macos/headers/erlang CACHE STRING "Path to the Erlang header files")
12-
else()
13-
execute_process(
14-
COMMAND erl -noshell -eval "io:format(\"~s~n\", [filename:join([lists:concat([code:root_dir(), \"/erts-\", erlang:system_info(version)]), \"include\"])]), init:stop(0)."
15-
OUTPUT_VARIABLE FOUND_ERLANG_INCLUDE_PATH OUTPUT_STRIP_TRAILING_WHITESPACE)
16-
set(ERLANG_INCLUDE_PATH ${FOUND_ERLANG_INCLUDE_PATH} CACHE STRING "Path to the Erlang header files")
17-
endif()
18-
198
option(USE_SYSTEM_LIBS "Use system libraries instead of bundled libraries when building" OFF)
209

21-
message(STATUS "ERLANG_INCLUDE_PATH: ${ERLANG_INCLUDE_PATH}")
2210
message(STATUS "USE_SYSTEM_LIBS: ${USE_SYSTEM_LIBS}")
2311

2412
include(GNUInstallDirs)
@@ -33,7 +21,6 @@ ExternalProject_Add(sp_midi
3321
INSTALL_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../server/beam/tau/priv
3422
CMAKE_ARGS
3523
-DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_SOURCE_DIR}/../server/beam/tau/priv
36-
-DERLANG_INCLUDE_PATH=${ERLANG_INCLUDE_PATH}
3724
-DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}
3825
-DUSE_SYSTEM_RTMIDI=${USE_SYSTEM_LIBS}
3926
BUILD_COMMAND ${CMAKE_COMMAND} --build . --config ${CMAKE_BUILD_TYPE}
@@ -45,7 +32,6 @@ ExternalProject_Add(sp_link
4532
INSTALL_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../server/beam/tau/priv
4633
CMAKE_ARGS
4734
-DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_SOURCE_DIR}/../server/beam/tau/priv
48-
-DERLANG_INCLUDE_PATH=${ERLANG_INCLUDE_PATH}
4935
-DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}
5036
BUILD_COMMAND ${CMAKE_COMMAND} --build . --config ${CMAKE_BUILD_TYPE}
5137
)

prebuilt/macos/headers/erlang/driver_int.h

Lines changed: 0 additions & 42 deletions
This file was deleted.

0 commit comments

Comments
 (0)