jack
/
terravisor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove UNIX check

This commit is contained in:
Jack 2024-08-23 22:18:32 -04:00
parent 6b06d8651a
commit 4cf7c4d102
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -14,8 +14,8 @@ find_package(assimp CONFIG REQUIRED)
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/) set(FreeImage_LIBRARIES $ENV{VCPKG_ROOT}/packages/freeimage_x64-windows/lib/)
elseif (UNIX) else()
set(FreeImage_INCLUDE_DIR $ENV{VCPKG_ROOT}/installed/x64-linux/include) set(FreeImage_INCLUDE_DIR $ENV{VCPKG_ROOT}/packages/freeimage_x64-linux/include)
set(FreeImage_LIBRARIES $ENV{VCPKG_ROOT}/packages/freeimage_x64-linux/lib) set(FreeImage_LIBRARIES $ENV{VCPKG_ROOT}/packages/freeimage_x64-linux/lib)
endif() endif()
@ -32,13 +32,9 @@ file(GLOB IMGUI_SOURCES
"${CMAKE_SOURCE_DIR}/imgui/backends/imgui_impl_glfw.cpp" "${CMAKE_SOURCE_DIR}/imgui/backends/imgui_impl_glfw.cpp"
"${CMAKE_SOURCE_DIR}/imgui/backends/imgui_impl_opengl3.cpp" "${CMAKE_SOURCE_DIR}/imgui/backends/imgui_impl_opengl3.cpp"
) )
file(GLOB FREEIMAGE
"$ENV{VCPKG_ROOT}/installed/x64-linux/include/FreeImage.h"
"$ENV{VCPKG_ROOT}/installed/x64-linux/include/FreeImagePlus.h"
)
# Add the executable # Add the executable
add_executable(TerraVisor ${SOURCES} ${HEADERS} ${IMGUI_SOURCES} ${FREEIMAGE}) add_executable(TerraVisor ${SOURCES} ${HEADERS} ${IMGUI_SOURCES} )
# Include directories (handled by find_package now) # Include directories (handled by find_package now)
include_directories( include_directories(