Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Unittest build, internal build fixes #2490

Merged
merged 1 commit into from
May 17, 2019
Merged

Fix Unittest build, internal build fixes #2490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions vnext/ReactUWP/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ set(SOURCES
Views/FlyoutViewManager.cpp
Views/FrameworkElementViewManager.cpp
Views/ImageViewManager.cpp
Views/Impl/ScrollViewUWPImplementation.cpp
Views/Impl/SnapPointManagingContentControl.cpp
Views/PickerViewManager.cpp
Views/PopupViewManager.cpp
Views/RawTextViewManager.cpp
Expand All @@ -70,6 +72,7 @@ add_definitions(-DRN_PLATFORM=uwp)
target_compile_definitions(React.UWPStatic PRIVATE UNICODE _UNICODE JSI_EXPORT REACTWINDOWS_BUILD REACTWINDOWS_STATIC)
target_compile_options(React.UWPStatic PRIVATE /await /wd4996)

target_include_directories(React.UWPStatic PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../shared")
target_include_directories(React.UWPStatic PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/ABI/idl")

target_include_directories(React.UWPStatic PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/..")
Expand Down
1 change: 1 addition & 0 deletions vnext/Universal.UnitTests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ find_package(VSCppUnitTest REQUIRED)
add_definitions(-DREACTWINDOWS_STATIC)

# The Visual Studio builds are a complete spaghetti crapshoot of interdependencies; please let's kill it so we can start cleaning up the code
target_include_directories(ReactWindows.Universal.UnitTests PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../shared")
target_include_directories(ReactWindows.Universal.UnitTests PRIVATE ${VC_UNITTEST_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}
"./../ReactUWP"
"./../ReactWindowsCore"
Expand Down
2 changes: 1 addition & 1 deletion vnext/Universal.UnitTests/React.Windows.Universal.UnitTests.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<ItemDefinitionGroup>
<ClCompile>
<AdditionalOptions>/await /bigobj %(AdditionalOptions)</AdditionalOptions>
<AdditionalIncludeDirectories>$(ReactNativeWindowsDir)include\ReactWindowsCore;$(ReactNativeWindowsDir)include\ReactUWP;$(ReactNativeWindowsDir)ReactWindowsCore;$(ReactNativeWindowsDir)ReactUWP;$(FollyDir);$(ReactNativeDir)\ReactCommon;$(YogaDir);$(ReactNativeWindowsDir)stubs;$(ReactNativeWindowsDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ReactNativeWindowsDir)include\ReactWindowsCore;$(ReactNativeWindowsDir)include\ReactUWP;$(ReactNativeWindowsDir)ReactWindowsCore;$(ReactNativeWindowsDir)ReactUWP;$(ReactNativeWindowsDir)include;$(ReactNativeWindowsDir)stubs;$(ReactNativeWindowsDir)Shared;$(FollyDir);$(ReactNativeDir)\ReactCommon;$(YogaDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>RN_PLATFORM=uwp;USE_EDGEMODE_JSRT;GTEST_LANG_CXX11=1;WIN32_LEAN_AND_MEAN;NOMINMAX;FOLLY_NO_CONFIG;RN_EXPORT=;WIN32=0;WINRT=1;NOJSC;_HAS_AUTO_PTR_ETC;BOOST_ASIO_WINDOWS_APP;BOOST_BEAST_USE_WIN32_FILE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<CompileAsWinRT>true</CompileAsWinRT>
<PrecompiledHeader>Use</PrecompiledHeader>
Expand Down
2 changes: 1 addition & 1 deletion vnext/include/CppWinRTIncludes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#pragma once

#include <winrt\Windows.UI.Xaml.Controls.Primitives.h>
#include <winrt/Windows.UI.Xaml.Controls.Primitives.h>

namespace winrt
{
Expand Down