diff --git a/CMakeLists.txt b/CMakeLists.txt index 6d2bc17..fa68fb1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,20 +62,13 @@ if (UNLOCKER_DUMPER) set(CUE4PARSE_NATIVE_DIR "${cue4parse_SOURCE_DIR}/CUE4Parse-Natives") add_subdirectory(${CUE4PARSE_NATIVE_DIR}) - # net - set(CUE4PARSE_NET_DIR "${cue4parse_SOURCE_DIR}/CUE4Parse") - set(CUE4PARSE_OUTPUT_DIR "${CUE4PARSE_NET_DIR}/bin/$(Configuration)/net8.0") - - add_custom_target(CUE4Parse-Net - COMMAND dotnet build "${CUE4PARSE_NET_DIR}/CUE4Parse.csproj" - --configuration $(Configuration) - -p:BuildNatives=false - -p:SkipNativeBuild=true - -p:CMakeExitCode=0 - --output "${CUE4PARSE_OUTPUT_DIR}" - WORKING_DIRECTORY "${CUE4PARSE_NET_DIR}" - COMMENT "Building CUE4Parse" + include_external_msproject( + CUE4Parse-Net + "${cue4parse_SOURCE_DIR}/CUE4Parse/CUE4Parse.csproj" + TYPE "9A19103F-16F7-4668-BE54-9A1E7A4F7556" + PLATFORM "Any CPU" ) + add_dependencies(CUE4Parse-Net CUE4Parse-Natives) endif() set(SEALLIB_ASSERT ON CACHE BOOL "" FORCE) @@ -116,9 +109,8 @@ endif() # dumper # ------------------------------ if (UNLOCKER_DUMPER) - include_external_msproject(hex-dumped "${CMAKE_CURRENT_SOURCE_DIR}/src/dumper/hex-dumped.csproj") - set_target_properties(hex-dumped PROPERTIES VS_PROJECT_TYPE "9A19103F-16F7-4668-BE54-9A1E7A4F7556") - add_dependencies(hex-dumped CUE4Parse-Natives CUE4Parse-Net) + include_external_msproject(hex-dumped "${CMAKE_CURRENT_SOURCE_DIR}/src/dumper/hex-dumped.csproj" TYPE "9A19103F-16F7-4668-BE54-9A1E7A4F7556") + add_dependencies(hex-dumped CUE4Parse-Net) endif() # ------------------------------ diff --git a/src/dumper/hex-dumped.csproj b/src/dumper/hex-dumped.csproj index 7530973..1126a09 100644 --- a/src/dumper/hex-dumped.csproj +++ b/src/dumper/hex-dumped.csproj @@ -1,6 +1,5 @@  - {3CC38FE8-76CA-38B5-8D90-6E68FA37A029} Exe net10.0-windows true @@ -9,9 +8,9 @@ x64 Debug;Release 1.0.0 - ..\..\proj\$(Configuration)\ - ..\..\proj\obj\$(MSBuildProjectName)\ + $(SolutionDir)bin\$(MSBuildProjectName)\ + $(SolutionDir)obj\$(MSBuildProjectName)\ @@ -23,8 +22,9 @@ - + {E3464BCC-66F1-3FBA-B83E-B064C2637900} + BuildNatives=false;SkipNativeBuild=true;CMakeExitCode=0;Platform=AnyCPU - + \ No newline at end of file