update build system

This commit is contained in:
Akash Mozumdar 2018-10-21 15:07:18 -04:00
parent 28ed31dcaf
commit bb3140e4af
3 changed files with 20 additions and 14 deletions

7
.gitignore vendored
View File

@ -1,2 +1,5 @@
gui/command.cpp Build/
.vs/ Builds/
*.vs/
*.vscode/
*.user

View File

@ -7,10 +7,14 @@ project(ITHVNR)
set(WDK_HOME "C:\\WinDDK\\7600.16385.1" CACHE FILEPATH "Windows Driver Kit path") set(WDK_HOME "C:\\WinDDK\\7600.16385.1" CACHE FILEPATH "Windows Driver Kit path")
set(CMAKE_INSTALL_PREFIX "" CACHE FILEPATH "installation path") set(CMAKE_INSTALL_PREFIX "" CACHE FILEPATH "installation path")
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/Debug") if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/Release") set(CMAKE_FINAL_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/Builds/${CMAKE_BUILD_TYPE}/x64)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/Debug") else()
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/Release") set(CMAKE_FINAL_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/Builds/${CMAKE_BUILD_TYPE}/x86)
endif()
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_FINAL_OUTPUT_DIRECTORY})
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_FINAL_OUTPUT_DIRECTORY})
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_FINAL_OUTPUT_DIRECTORY})
set(CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION ON) set(CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION ON)

View File

@ -4,14 +4,13 @@
"name": "x86-Debug", "name": "x86-Debug",
"generator": "Ninja", "generator": "Ninja",
"configurationType": "Debug", "configurationType": "Debug",
"inheritEnvironments": [ "inheritEnvironments": ["msvc_x86"]
"msvc_x86" },
], {
"buildRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\build\\${name}", "name": "x86-Release",
"installRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\install\\${name}", "generator": "Ninja",
"cmakeCommandArgs": "", "configurationType": "RelWithDebInfo",
"buildCommandArgs": "-v", "inheritEnvironments": ["msvc_x86"]
"ctestCommandArgs": ""
} }
] ]
} }