From ffeb4e2dad2a4d5ab8336327bfe5d4f3ba61bd3c Mon Sep 17 00:00:00 2001 From: Akash Mozumdar Date: Sun, 22 Jul 2018 23:27:12 -0700 Subject: [PATCH] final fix for build pipeline --- CMakeLists.txt | 14 +++++++++----- GUI/GUI.pro | 2 +- README.md | 1 + 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index eac5ce9..050bff0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,12 +1,7 @@ cmake_minimum_required(VERSION 2.8) -set(CMAKE_CONFIGURATION_TYPES Debug Release) - project(NextHooker) -set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/Debug") -set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/Release") - add_compile_options( #/Zc:auto # config.pri /wd4819 # config.pri @@ -29,5 +24,14 @@ include_directories( texthook ) +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/Debug) +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/Debug) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/Debug) +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/Release) +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/Release) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/Release) + +set(CMAKE_CONFIGURATION_TYPES Debug Release) + add_subdirectory(texthook) add_subdirectory(vnrhook) diff --git a/GUI/GUI.pro b/GUI/GUI.pro index dcccb00..765e480 100644 --- a/GUI/GUI.pro +++ b/GUI/GUI.pro @@ -33,7 +33,7 @@ FORMS += \ mainwindow.ui win32: LIBS += \ - -L$$PWD/../Builds/Debug/texthook/ -lvnrhost + -L$$PWD/../Builds/Debug/Debug/ -lvnrhost # Default rules for deployment. qnx: target.path = /tmp/$${TARGET}/bin diff --git a/README.md b/README.md index 49e60d9..a9422ee 100644 --- a/README.md +++ b/README.md @@ -48,6 +48,7 @@ GPL v3 ## Compiling Before compiling *NextHooker*, you should get Visual Studio with CMake and ATL support, as well as Qt version 5.11
+Use Visual Studio to compile all the CMake projects, then use Qt Creator to compile/run the GUI. ## Project Architecture