osx zip packing

Author: royshil

CMakeLists.txt

@@ -36,6 +36,8 @@ if (UNIX)
     set(Onnxruntime_INCLUDE_HINT /usr/local/include/)
 endif()
 
+set(RELEASE_DIR "${PROJECT_SOURCE_DIR}/release" CACHE STRING "Directory for building release packages")
+
 set(CMAKE_PREFIX_PATH "${QTDIR}")
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_SOURCE_DIR}/external")
@@ -121,9 +123,7 @@ if(WIN32)
 	endif()
 
     # find the onnxruntime DLL for packaging with the plugin DLL
-    if (WIN32)
-        set(Onnxruntime_DLL "${Onnxruntime_LIBRARY_DIR}/onnxruntime.dll")
-    endif()
+    set(Onnxruntime_DLL "${Onnxruntime_LIBRARY_DIR}/onnxruntime.dll")
 
     # Enable Multicore Builds and disable FH4 (to not depend on VCRUNTIME140_1.DLL when building with VS2019)
     if (MSVC)
@@ -148,8 +148,6 @@ if(WIN32)
 
 	# --- Release package helper ---
 	# The "release" folder has a structure similar OBS' one on Windows
-	set(RELEASE_DIR "${PROJECT_SOURCE_DIR}/release")
-
     add_custom_command(TARGET ${CMAKE_PROJECT_NAME} POST_BUILD
         # If config is Release or RelWithDebInfo, package release files
         COMMAND if $<OR:$<CONFIG:Release>,$<CONFIG:RelWithDebInfo>>==1 (
@@ -209,9 +207,7 @@ if(WIN32)
     )
 	# --- End of sub-section ---
 
-    install(DIRECTORY "${RELEASE_DIR}/"
-        DESTINATION .
-    )
+    install(DIRECTORY "${RELEASE_DIR}/" DESTINATION .)
     # Tell CPack to create a zip file.
     set(CPACK_GENERATOR "ZIP")
     # Tell CPack what to name the zip file. It will append `.zip`.
@@ -251,5 +247,38 @@ if(APPLE)
 
 	set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES PREFIX "")
 	target_link_libraries(${CMAKE_PROJECT_NAME} "${OBS_FRONTEND_LIB}")
+
+    add_custom_command(TARGET ${CMAKE_PROJECT_NAME} POST_BUILD
+        # If config is Release or RelWithDebInfo, package release files
+        COMMAND
+            "${CMAKE_COMMAND}" ARGS -E make_directory
+                "${RELEASE_DIR}/Resources/data/obs-plugins/${CMAKE_PROJECT_NAME}"
+                "${RELEASE_DIR}/Plugins"
+
+
+        COMMAND
+            "${CMAKE_COMMAND}" ARGS -E copy_directory
+                "${PROJECT_SOURCE_DIR}/data"
+                "${RELEASE_DIR}/Resources/data/obs-plugins/${CMAKE_PROJECT_NAME}"
+
+
+        COMMAND
+            "${CMAKE_COMMAND}" ARGS -E copy
+                "$<TARGET_FILE:${CMAKE_PROJECT_NAME}>"
+                "${RELEASE_DIR}/Plugins/"
+
+    )
+
+    install(DIRECTORY "${RELEASE_DIR}/" DESTINATION .)
+
+    # Tell CPack to create a zip file.
+    set(CPACK_GENERATOR "ZIP")
+    # Tell CPack what to name the zip file. It will append `.zip`.
+    set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-macosx")
+    # Tell CPack not to put everything inside an enclosing directory.
+    set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY OFF)
+    # Apparently this should be always on but isn't for backwards compatibility.
+    set(CPACK_VERBATIM_VARIABLES YES)
+    include(CPack)
 endif()
 # -- End of section --

external/FindLibObs.cmake

@@ -37,8 +37,14 @@ find_path(LIBOBS_INCLUDE_DIR
 		/usr/include /usr/local/include /opt/local/include /sw/include
 	PATH_SUFFIXES
 		libobs
+	DOC "Lib OBS include directory"
 	)
 
+if(APPLE)
+	# Hopeful hint at libobs in the /Applications folder
+	set(obsLibPath_osx "/Applications/OBS.app/Contents/Frameworks/")
+endif()
+
 function(find_obs_lib base_name repo_build_path lib_name)
 	string(TOUPPER "${base_name}" base_name_u)
 
@@ -55,6 +61,7 @@ function(find_obs_lib base_name repo_build_path lib_name)
 			${obsPath}
 			${obsLibPath}
 			${_${base_name_u}_LIBRARY_DIRS}
+			${obsLibPath_osx}
 		PATHS
 			/usr/lib /usr/local/lib /opt/local/lib /sw/lib
 		PATH_SUFFIXES
@@ -76,6 +83,7 @@ function(find_obs_lib base_name repo_build_path lib_name)
 			build/${repo_build_path}/Debug
 			build/${repo_build_path}/Release
 			build/${repo_build_path}/RelWithDebInfo
+		DOC "Lib OBS library"
 		)
 endfunction()
 
@@ -98,8 +106,8 @@ if(LIBOBS_FOUND)
 		set(W32_PTHREADS_INCLUDE_DIR ${LIBOBS_INCLUDE_DIR}/../deps/w32-pthreads)
 	endif()
 
-	set(LIBOBS_INCLUDE_DIRS ${LIBOBS_INCLUDE_DIR} ${W32_PTHREADS_INCLUDE_DIR})
-	set(LIBOBS_LIBRARIES ${LIBOBS_LIB} ${W32_PTHREADS_LIB})
+	set(LIBOBS_INCLUDE_DIRS ${LIBOBS_INCLUDE_DIR} ${W32_PTHREADS_INCLUDE_DIR} CACHE STRING "Lib OBS include directories")
+	set(LIBOBS_LIBRARIES ${LIBOBS_LIB} ${W32_PTHREADS_LIB} CACHE STRING "Lib OBS libraries")
 
 	if (EXISTS ${LIBOBS_INCLUDE_DIR}/../cmake/external/ObsPluginHelpers.cmake)
 		include(${LIBOBS_INCLUDE_DIR}/../cmake/external/ObsPluginHelpers.cmake)

external/FindOnnxruntime.cmake

@@ -7,8 +7,9 @@
 
 set(Onnxruntime_DIR_BUILD ${CMAKE_BINARY_DIR}/onnxruntime/)
 if(APPLE AND EXISTS ${Onnxruntime_DIR_BUILD})
-    file(GLOB Onnxruntime_LIBRARIES ${Onnxruntime_DIR_BUILD}/lib/lib*.a)
-    set(Onnxruntime_INCLUDE_DIR ${Onnxruntime_DIR_BUILD}/include)
+    file(GLOB Onnxruntime_LIBRARIES_EX ${Onnxruntime_DIR_BUILD}/lib/lib*.a)
+    set(Onnxruntime_LIBRARIES ${Onnxruntime_LIBRARIES_EX} CACHE STRING "Onnxruntime libraries")
+    set(Onnxruntime_INCLUDE_DIR ${Onnxruntime_DIR_BUILD}/include CACHE STRING "Onnxruntime include directory")
 else()
     find_library(Onnxruntime_LIBRARIES
         NAMES
@@ -34,12 +35,18 @@ include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(Onnxruntime DEFAULT_MSG Onnxruntime_INCLUDE_DIR Onnxruntime_LIBRARIES)
 
 if (Onnxruntime_FOUND)
-    set(Onnxruntime_INCLUDE_DIRS ${Onnxruntime_INCLUDE_DIR} )
+    set(Onnxruntime_INCLUDE_DIRS ${Onnxruntime_INCLUDE_DIR} CACHE STRING "Onnxruntime include directories")
     if (APPLE)
         set(Onnxruntime_INCLUDE_DIRS ${Onnxruntime_INCLUDE_DIRS} ${Onnxruntime_INCLUDE_DIR}/onnxruntime/core/session)
     endif()
-    get_filename_component(Onnxruntime_LIBRARY_DIR ${Onnxruntime_LIBRARY} DIRECTORY)
+    list(GET Onnxruntime_LIBRARIES 0 Onnxruntime_LIBRARY)
+    get_filename_component(Onnxruntime_LIBRARY_DIR_EX ${Onnxruntime_LIBRARY} DIRECTORY)
+    set(Onnxruntime_LIBRARY_DIR ${Onnxruntime_LIBRARY_DIR_EX} CACHE STRING "Onnxruntime library directory")
 endif()
 
 # Tell cmake GUIs to ignore the "local" variables.
-mark_as_advanced(Onnxruntime_INCLUDE_DIR Onnxruntime_LIBRARY)
+mark_as_advanced(Onnxruntime_INCLUDE_DIR
+                 Onnxruntime_LIBRARY
+                 Onnxruntime_INCLUDE_DIRS
+                 Onnxruntime_LIBRARY_DIR
+                 Onnxruntime_LIBRARIES)