Skip to content

Consistently enable INSTALL project in Visual Studio solution #1037

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

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Consistently enable INSTALL project in Visual Studio solution #1037

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
4 changes: 4 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,10 @@ endif()
# Custom default install location.
if(BUILD_DLL)
get_filename_component(DLL_INSTALL_PREFIX "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Electronic Arts\\EA Games\\Command and Conquer Generals Zero Hour;InstallPath]" ABSOLUTE CACHE)
if(MSVC)
# Include INSTALL to build by default. This copies dll's and pdb's to game directory.
set(CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD 1)
endif()
endif()

if(WIN32 OR "${CMAKE_SYSTEM}" MATCHES "Windows")
Expand Down
3 changes: 1 addition & 2 deletions tools/build/win_scripts/vs_create_solution.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ cd /d "%SolutionDir%"
"%CMakeDir%\bin\cmake.exe" ^
-G "%GeneratorName%" ^
-A Win32 ^
-S "%ProjectDir%" ^
-DCMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD=1
-S "%ProjectDir%"

cd /d "%cd%"
:: Open cmake gui for user customizations
Expand Down