update for vs 2019

This commit is contained in:
Akash Mozumdar 2019-06-07 02:58:45 -04:00
parent 958ce10327
commit 7964623ec8
3 changed files with 6 additions and 4 deletions

1
.gitignore vendored
View File

@ -1,6 +1,7 @@
/Textractor* /Textractor*
/build/ /build/
/builds/ /builds/
/out/
*.vs/ *.vs/
*.vscode/ *.vscode/
*.user *.user

View File

@ -25,6 +25,8 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY $<1:${CMAKE_FINAL_OUTPUT_DIRECTORY}>)
include_directories(include) include_directories(include)
link_directories(${LIBDIR}) link_directories(${LIBDIR})
file(GLOB LIBS ${LIBDIR}/*)
file(COPY ${LIBS} DESTINATION ${CMAKE_FINAL_OUTPUT_DIRECTORY})
add_library(text text.cpp) add_library(text text.cpp)
target_compile_definitions(text PRIVATE ${TEXT_LANGUAGE}) target_compile_definitions(text PRIVATE ${TEXT_LANGUAGE})

View File

@ -22,10 +22,9 @@ foreach ($language in @{
foreach ($arch in @("x86", "x64")) foreach ($arch in @("x86", "x64"))
{ {
cd $arch; cd $arch;
$cmakeArch = if ($arch -eq "x86") {""} else {" Win64"}; $VS_arch = if ($arch -eq "x86") {"Win32"} else {"x64"};
$vsArch = if ($arch -eq "x86") {"Win32"} else {"x64"}; cmake -G "Visual Studio 16 2019" -A"$VS_arch" -DVERSION="$version" -DTEXT_LANGUAGE="$($language.Key)" -DCMAKE_BUILD_TYPE="Release" ../..;
cmake -G "Visual Studio 15 2017$cmakeArch" -DVERSION="$version" -DTEXT_LANGUAGE="$($language.Key)" -DCMAKE_BUILD_TYPE="Release" ../..; &"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\devenv" Textractor.sln /build "Release|$VS_arch";
&"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\devenv" Textractor.sln /build "Release|$vsArch";
cd ..; cd ..;
mkdir -Force -Verbose "$folder/$arch"; mkdir -Force -Verbose "$folder/$arch";
foreach ($file in @( foreach ($file in @(