Skip to content

Commit

Permalink
Build - remove Erlang headers - these are now in the external subproj…
Browse files Browse the repository at this point in the history
…ects sp_midi and sp_link
  • Loading branch information
samaaron committed Jan 5, 2023
1 parent ecdc840 commit 3ba2600
Show file tree
Hide file tree
Showing 25 changed files with 0 additions and 6,830 deletions.
14 changes: 0 additions & 14 deletions app/external/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,8 @@ message(STATUS "Externals Builder")

project(ExternalsBuilder)

if(WIN32)
set(ERLANG_INCLUDE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../prebuilt/windows/headers/erlang CACHE STRING "Path to the Erlang header files")
elseif(${CMAKE_SYSTEM_NAME} MATCHES Darwin) # macOS
set(ERLANG_INCLUDE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../prebuilt/macos/headers/erlang CACHE STRING "Path to the Erlang header files")
else()
execute_process(
COMMAND erl -noshell -eval "io:format(\"~s~n\", [filename:join([lists:concat([code:root_dir(), \"/erts-\", erlang:system_info(version)]), \"include\"])]), init:stop(0)."
OUTPUT_VARIABLE FOUND_ERLANG_INCLUDE_PATH OUTPUT_STRIP_TRAILING_WHITESPACE)
set(ERLANG_INCLUDE_PATH ${FOUND_ERLANG_INCLUDE_PATH} CACHE STRING "Path to the Erlang header files")
endif()

option(USE_SYSTEM_LIBS "Use system libraries instead of bundled libraries when building" OFF)

message(STATUS "ERLANG_INCLUDE_PATH: ${ERLANG_INCLUDE_PATH}")
message(STATUS "USE_SYSTEM_LIBS: ${USE_SYSTEM_LIBS}")

include(GNUInstallDirs)
Expand All @@ -33,7 +21,6 @@ ExternalProject_Add(sp_midi
INSTALL_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../server/beam/tau/priv
CMAKE_ARGS
-DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_SOURCE_DIR}/../server/beam/tau/priv
-DERLANG_INCLUDE_PATH=${ERLANG_INCLUDE_PATH}
-DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}
-DUSE_SYSTEM_RTMIDI=${USE_SYSTEM_LIBS}
BUILD_COMMAND ${CMAKE_COMMAND} --build . --config ${CMAKE_BUILD_TYPE}
Expand All @@ -45,7 +32,6 @@ ExternalProject_Add(sp_link
INSTALL_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../server/beam/tau/priv
CMAKE_ARGS
-DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_SOURCE_DIR}/../server/beam/tau/priv
-DERLANG_INCLUDE_PATH=${ERLANG_INCLUDE_PATH}
-DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}
BUILD_COMMAND ${CMAKE_COMMAND} --build . --config ${CMAKE_BUILD_TYPE}
)
Expand Down
42 changes: 0 additions & 42 deletions prebuilt/macos/headers/erlang/driver_int.h

This file was deleted.

Loading

0 comments on commit 3ba2600

Please sign in to comment.