From 97661469f53af1bfe8f51ca145a45caa1d93e2c6 Mon Sep 17 00:00:00 2001 From: Ian Brown Date: Thu, 18 Mar 2021 13:02:43 +0000 Subject: [PATCH] build fixes --- .gitignore | 2 ++ CMakeLists.txt | 17 +++++++++-------- buildscripts/generate_vs2019_64.cmd | 5 +++++ 3 files changed, 16 insertions(+), 8 deletions(-) create mode 100644 buildscripts/generate_vs2019_64.cmd diff --git a/.gitignore b/.gitignore index 2ede6b4..2966092 100644 --- a/.gitignore +++ b/.gitignore @@ -82,3 +82,5 @@ Release/ /.vs build +build_* + diff --git a/CMakeLists.txt b/CMakeLists.txt index aed2393..a1384b4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,8 +9,11 @@ set(PROJECT_NAME "Frostbite") set(PROJECT_Version 0.1) set(PROJECT_LIBS) -# CMAKE_PREFIX_PATH evn var or cach var should be set to find Qt -set(CMAKE_PREFIX_PATH "C:\\Qt\\6.0.2\\msvc2019_64") +# Use this to find Qt on windows +if(ADDITIONAL_FIND_PATH) + list(APPEND CMAKE_PREFIX_PATH ${ADDITIONAL_FIND_PATH}) +endif() + set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) @@ -18,16 +21,13 @@ find_package(Qt6 COMPONENTS Widgets REQUIRED) set(COVERAGE OFF CACHE BOOL "Coverage") -set(Boost_USE_STATIC_LIBS ON) -find_package(Boost REQUIRED COMPONENTS program_options filesystem) -if(Boost_FOUND) - include_directories(${Boost_INCLUDE_DIRS}) -endif() + +find_package(SDL2 REQUIRED) find_package(GLM REQUIRED) include_directories(${GLM_INCLUDE_DIR}) -find_package(SDL2 REQUIRED) + find_package(GLEW REQUIRED) include_directories(${GLEW_INCLUDE_DIR}) @@ -99,4 +99,5 @@ target_link_libraries(testApp snowlib ${Boost_LIBRARIES} ${GLEW_LIBRARIES} SDL2: add_executable(cuttownTest ${CUTTOWN_SRC_FILES}) target_link_libraries(cuttownTest snowlib ${Boost_LIBRARIES} ${GLEW_LIBRARIES} SDL2::SDL2 SDL2::SDL2main opengl32.lib Qt6::Widgets) +set_target_properties(cuttownTest PROPERTIES VS_DEBUGGER_ENVIRONMENT "PATH=${Qt6Core_DIR}\\..\\..\\..\\bin;${Qt6Core_DIR}\\..\\..\\..\\plugins\\platforms") diff --git a/buildscripts/generate_vs2019_64.cmd b/buildscripts/generate_vs2019_64.cmd new file mode 100644 index 0000000..efad611 --- /dev/null +++ b/buildscripts/generate_vs2019_64.cmd @@ -0,0 +1,5 @@ +@echo off +mkdir build_vs2019 +pushd build_vs2019 +cmake --debug --debug-find -G "Visual Studio 16 2019" -A x64 -DADDITIONAL_FIND_PATH="C:\Qt\6.0.2\msvc2019_64" -DVCPKG_TARGET_TRIPLET=x64-windows -DCMAKE_TOOLCHAIN_FILE="C:\dev\vcpkg\scripts\buildsystems\vcpkg.cmake" ../.. +popd