chore: Integrate build fixes

Author: fuzzybinary

.github/workflows/build.yaml

@@ -30,7 +30,7 @@ jobs:
         run: dart ./scripts/build_helpers/bin/build_dart.dart -v
       - uses: threeal/[email protected]
       - name: Build Shared Library
-        run: cmake --build build --config release
+        run: cmake --build build --config release -DBUILD_SAMPLES=OFF
       - name: Assemble artifacts
         run: dart ./scripts/build_helpers/bin/assemble_artifacts.dart
       - name: 'Upload Artifact'

.gitignore

@@ -1,4 +1,7 @@
 dart-sdk/*
 .build/*
 build/*
-artifacts/*
+artifacts/*
+depot_tools/*
+out/*
+.vs

CMakeLists.txt

@@ -2,10 +2,20 @@ cmake_minimum_required(VERSION 3.21)
 
 project(DartSharedLibrary VERSION 0.1)
 
+option(BUILD_SMAPLES "Build the Sampels" ON)
+
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED True)
 set(DART_DLL_DIR "${PROJECT_SOURCE_DIR}/src")
 set(DART_DIR "${PROJECT_SOURCE_DIR}/dart-sdk/sdk")
 
+set(OUTPUT_DEBUG "${OUTPUT_PATH_EXT}/Debug")
+set(OUTPUT_RELEASE "${OUTPUT_PATH_EXT}/Release")
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_SOURCE_DIR}/out/$<$<CONFIG:DEBUG>:${OUTPUT_DEBUG}>$<$<CONFIG:RELEASE>:${OUTPUT_RELEASE}>")
+set(EXECUTABLE_OUTPUT_PATH "${PROJECT_SOURCE_DIR}/out/${OUTPUT_PATH_EXT}/${CMAKE_BUILD_TYPE}")
+set(LIBRARY_OUTPUT_DIRECTORY "${PROJECT_SOURCE_DIR}/out/${OUTPUT_PATH_EXT}/${CMAKE_BUILD_TYPE}")
+
 add_subdirectory(src)
-add_subdirectory(examples)
+if(BUILD_SAMPLES)
+    add_subdirectory(examples)
+endif()

examples/realtime_example/CMakeLists.txt

@@ -42,4 +42,7 @@ target_link_libraries(realtime_example PUBLIC dart_dll cute)
 
 if (MSVC)
 	set_property(TARGET realtime_example PROPERTY VS_DEBUGGER_WORKING_DIRECTORY $<TARGET_FILE_DIR:realtime_example>)	
-endif()
+endif()
+
+
+set(EXECUTABLE_OUTPUT_PATH "${EXECUTABLE_OUTPUT_PATH}/realtime_example")

examples/simple_example/CMakeLists.txt

@@ -15,10 +15,10 @@ add_custom_command(TARGET simple_example POST_BUILD
   COMMAND_EXPAND_LISTS
 )
 
-add_dependencies(simple_example ALWAYS_DO_POST_BUILD)
-
 target_link_libraries(simple_example PUBLIC dart_dll)
 
 if (MSVC)
-	set_property(TARGET simple_example PROPERTY VS_DEBUGGER_WORKING_DIRECTORY $<TARGET_FILE_DIR:simple_example>)	
-endif()
+	set_property(TARGET realtime_example PROPERTY VS_DEBUGGER_WORKING_DIRECTORY $<TARGET_FILE_DIR:simple_example>)	
+endif()
+
+set(EXECUTABLE_OUTPUT_PATH "${EXECUTABLE_OUTPUT_PATH}/simple_example")

examples/simple_example_ffi/CMakeLists.txt

@@ -16,4 +16,8 @@ add_custom_command(TARGET simple_example_ffi POST_BUILD
   COMMAND_EXPAND_LISTS
 )
 
+if (MSVC)
+	set_property(TARGET realtime_example PROPERTY VS_DEBUGGER_WORKING_DIRECTORY $<TARGET_FILE_DIR:simple_example_ffi>)	
+endif()
+
 target_link_libraries(simple_example_ffi PUBLIC dart_dll)

src/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.21)
 
 project(dart_dll VERSION 0.1.2)
 
@@ -14,16 +14,22 @@ add_library(dart_dll SHARED
     isolate_setup.cpp
 )
 
-target_include_directories(dart_dll PUBLIC
+target_include_directories(dart_dll PRIVATE
     "${DART_DIR}/runtime"
 )
 
 if(WIN32)
     set(LIB_PREFIX "lib")
 endif()
 
+cmake_path(ABSOLUTE_PATH DART_DIR NORMALIZE OUTPUT_VARIABLE DART_DIR)
+
 MESSAGE(STATUS "Dart SDK ${DART_DIR}")
 
+if(NOT EXISTS "${DART_DIR}/runtime/include/dart_api.h")
+MESSAGE(FATAL_ERROR "Missing Dart SDK or not found")
+endif()
+
 find_library(LIB_DART_DEBUG
     NAMES "${LIB_PREFIX}dart"
     HINTS "${DART_DIR}/out/DebugX64/obj/runtime/bin" "${DART_DIR}/xcodebuild/ReleaseX64/obj/runtime/bin"
@@ -41,10 +47,6 @@ target_compile_definitions(dart_dll PRIVATE
 )
 
 if(WIN32)
-    set_property(TARGET dart_dll PROPERTY
-        MSVC_RUNTIME_LIBRARY "MultiThreaded"
-    )
-
     target_compile_definitions(dart_dll PRIVATE
         _HAS_EXCEPTIONS=0
         _SCL_SECURE=0
@@ -87,6 +89,8 @@ endif()
 
 if(LIB_DART_DEBUG) 
     target_link_libraries(dart_dll debug ${LIB_DART_DEBUG})
+else()
+    target_link_libraries(dart_dll debug ${LIB_DART_RELEASE})
 endif()
 
 target_link_libraries(dart_dll optimized ${LIB_DART_RELEASE})