Skip to content

Commit

Permalink
Updated build.
Browse files Browse the repository at this point in the history
  • Loading branch information
ggarra13 committed Apr 30, 2024
1 parent 54def8f commit f12bd21
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 64 deletions.
4 changes: 0 additions & 4 deletions .github/workflows/full_win64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,6 @@ jobs:
- name: Build mrv2
run: |
./runme_nolog.sh reldeb -t package -D TLRENDER_USD=OFF
- name: Zip pdb files
run: |
./bin/zip_pdb.sh reldeb
- name: Upload binaries # Conditional step
run: |
Expand Down
26 changes: 18 additions & 8 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.23)
cmake_minimum_required(VERSION 3.25)



Expand All @@ -10,12 +10,23 @@ if(APPLE)
message( STATUS "-------------------------------------------------" )
endif()

#
# Sanity checks
#
if(TLRENDER_NDI)
if(NOT EXISTS "${TLRENDER_NDI_SDK}")
message(FATAL_ERROR "TLRENDER_NDI is ON but TLRENDER_NDI_SDK does not exist!\n${TLRENDER_NDI_SDK}")
endif()
endif()

if(MSVC)
if (CMAKE_BUILD_TYPE STREQUAL "Debug" OR
CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
message(STATUS "Embedding Debug information into executable.")
set(CMAKE_MSVC_DEBUG_INFORMATION TRUE)
endif()
endif()


cmake_policy(SET CMP0091 NEW)
cmake_policy(SET CMP0114 NEW)
Expand All @@ -29,19 +40,17 @@ include( cmake/functions.cmake )

if (APPLE)
message(STATUS "OLD_DYLD_LIBRARY_PATH=$ENV{OLD_DYLD_LIBRARY_PATH}")
message( STATUS "-------------------------------------------------" )
message(STATUS "-------------------------------------------------")
message(STATUS "DYLD_LIBRARY_PATH=$ENV{DYLD_LIBRARY_PATH}")
message( STATUS "-------------------------------------------------" )
message(STATUS "-------------------------------------------------")
elseif(UNIX)
message(STATUS "OLD_LD_LIBRARY_PATH=$ENV{OLD_LD_LIBRARY_PATH}")
message( STATUS "-------------------------------------------------" )
message(STATUS "LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH}")
message( STATUS "-------------------------------------------------" )
message(STATUS "-------------------------------------------------")
else()
message(STATUS "OLD_PATH=$ENV{OLD_PATH}")
message( STATUS "-------------------------------------------------" )
message(STATUS "PATH=$ENV{PATH}")
message( STATUS "-------------------------------------------------" )
message(STATUS "-------------------------------------------------")
endif()


Expand Down Expand Up @@ -115,7 +124,8 @@ elseif(APPLE)
# brew .dylibs are compiled only for the current version of the OS.
#
# We distribute libintl dylib compatible with v10.5
file(COPY precompiled/macOS/v10.5/ DESTINATION ${CMAKE_INSTALL_PREFIX}/
file(COPY
precompiled/macOS/v10.5/ DESTINATION ${CMAKE_INSTALL_PREFIX}/
FOLLOW_SYMLINK_CHAIN)
endif()
endif()
Expand Down
4 changes: 2 additions & 2 deletions bin/upload_sourceforge.sh
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ ${date}.
It does not support NDI® on any platform.
It works on Windows 8.1+ (without USD support), Ubuntu 20.04 LTS+,
macOS 11 (amd64) and macOS M1/M2/M3 (arm64).
macOS 12 (amd64 also without USD support) and macOS M1/M2/M3 (arm64).
It may contain bugs, new untested features and more.
Expand All @@ -118,7 +118,7 @@ You can extract it to compile yourself with:
git clone https://github.com/ggarra13/mrv2.git
cd mrv2
git checkout ${git_hash}
./runme.sh
./runme.sh clean
\`\`\`
Expand Down
50 changes: 0 additions & 50 deletions bin/zip_pdb.sh

This file was deleted.

0 comments on commit f12bd21

Please sign in to comment.