Update CMakeLists.txt

This commit is contained in:
Jack Christensen 2024-08-23 22:59:16 +00:00
parent ab8e9d3310
commit 3bcf6bac4f
1 changed files with 2 additions and 7 deletions

View File

@ -4,17 +4,13 @@ project(TerraVisor)
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
# Use the vcpkg toolchain file
#set(CMAKE_TOOLCHAIN_FILE "C:/vcpkg/scripts/buildsystems/vcpkg.cmake" CACHE STRING "Vcpkg toolchain file")
include(C:/vcpkg/scripts/buildsystems/vcpkg.cmake)
# Find packages using vcpkg # Find packages using vcpkg
find_package(GLEW CONFIG REQUIRED) find_package(GLEW CONFIG REQUIRED)
find_package(glfw3 CONFIG REQUIRED) find_package(glfw3 CONFIG REQUIRED)
find_package(glm CONFIG REQUIRED) find_package(glm CONFIG REQUIRED)
find_package(assimp CONFIG REQUIRED) find_package(assimp CONFIG REQUIRED)
# Direct linking to FreeImage libraries for now
if (WIN32) if (WIN32)
set(FreeImage_INCLUDE_DIR $ENV{VCPKG_ROOT}/packages/freeimage_x64-windows/include) set(FreeImage_INCLUDE_DIR $ENV{VCPKG_ROOT}/packages/freeimage_x64-windows/include)
set(FreeImage_LIBRARIES $ENV{VCPKG_ROOT}/packages/freeimage_x64-windows/lib/FreeImage.lib) set(FreeImage_LIBRARIES $ENV{VCPKG_ROOT}/packages/freeimage_x64-windows/lib/FreeImage.lib)
@ -23,6 +19,7 @@ elseif (UNIX)
set(FreeImage_LIBRARIES $ENV{VCPKG_ROOT}/packages/freeimage_x64-linux/lib/libFreeImage.a) set(FreeImage_LIBRARIES $ENV{VCPKG_ROOT}/packages/freeimage_x64-linux/lib/libFreeImage.a)
endif() endif()
# Set Debug and Release directories
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}") set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}")
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}") set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}")
@ -36,8 +33,6 @@ file(GLOB IMGUI_SOURCES
"${CMAKE_SOURCE_DIR}/imgui/backends/imgui_impl_opengl3.cpp" "${CMAKE_SOURCE_DIR}/imgui/backends/imgui_impl_opengl3.cpp"
) )
message(STATUS "Sources: ${SOURCES}")
# Add the executable # Add the executable
add_executable(TerraVisor ${SOURCES} ${HEADERS} ${IMGUI_SOURCES}) add_executable(TerraVisor ${SOURCES} ${HEADERS} ${IMGUI_SOURCES})