Remove UNIX check
This commit is contained in:
parent
6b06d8651a
commit
4cf7c4d102
|
@ -14,8 +14,8 @@ find_package(assimp CONFIG REQUIRED)
|
|||
if (WIN32)
|
||||
set(FreeImage_INCLUDE_DIR $ENV{VCPKG_ROOT}/packages/freeimage_x64-windows/include)
|
||||
set(FreeImage_LIBRARIES $ENV{VCPKG_ROOT}/packages/freeimage_x64-windows/lib/)
|
||||
elseif (UNIX)
|
||||
set(FreeImage_INCLUDE_DIR $ENV{VCPKG_ROOT}/installed/x64-linux/include)
|
||||
else()
|
||||
set(FreeImage_INCLUDE_DIR $ENV{VCPKG_ROOT}/packages/freeimage_x64-linux/include)
|
||||
set(FreeImage_LIBRARIES $ENV{VCPKG_ROOT}/packages/freeimage_x64-linux/lib)
|
||||
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_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_executable(TerraVisor ${SOURCES} ${HEADERS} ${IMGUI_SOURCES} ${FREEIMAGE})
|
||||
add_executable(TerraVisor ${SOURCES} ${HEADERS} ${IMGUI_SOURCES} )
|
||||
|
||||
# Include directories (handled by find_package now)
|
||||
include_directories(
|
||||
|
|
Loading…
Reference in New Issue