Compare commits
3 Commits
windows-sh
...
main
Author | SHA1 | Date | |
---|---|---|---|
|
24064274c5 | ||
|
90268c3e43 | ||
|
b7a9ac3e93 |
|
@ -55,34 +55,6 @@ set(GLFW_BUILD_DOCS OFF CACHE BOOL "" FORCE)
|
||||||
set(GLFW_BUILD_TESTS OFF CACHE BOOL "" FORCE)
|
set(GLFW_BUILD_TESTS OFF CACHE BOOL "" FORCE)
|
||||||
set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
|
set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
|
||||||
|
|
||||||
#find_path(GLFW_INCLUDE_DIR GLFW/glfw3.h
|
|
||||||
#HINTS
|
|
||||||
#${CMAKE_CURRENT_SOURCE_DIR}/include
|
|
||||||
#${CMAKE_CURRENT_SOURCE_DIR}/lib
|
|
||||||
#${GLFW_ROOT}
|
|
||||||
#${GLFW_ROOT}/include)
|
|
||||||
#
|
|
||||||
#if(GLFW_INCLUDE_DIR)
|
|
||||||
#message(STATUS "GLFW_INCLUDE_DIR: ${GLFW_INCLUDE_DIR}")
|
|
||||||
#else()
|
|
||||||
#message(FATAL_ERROR "glfw3.h not found")
|
|
||||||
#endif()
|
|
||||||
#
|
|
||||||
#find_path(GLFW_LIB_DIR glfw3.lib
|
|
||||||
#HINTS
|
|
||||||
#${CMAKE_CURRENT_SOURCE_DIR}/include
|
|
||||||
#${CMAKE_CURRENT_SOURCE_DIR}/lib
|
|
||||||
#${GLFW_ROOT}/lib
|
|
||||||
#${GLFW_ROOT}/lib-vc2019
|
|
||||||
#${GLFW_ROOT}/lib-vc2017
|
|
||||||
#${GLFW_ROOT}/lib-vc2015)
|
|
||||||
#
|
|
||||||
#if(GLFW_LIB_DIR)
|
|
||||||
#message(STATUS "GLFW_LIB_DIR: ${GLFW_LIB_DIR}")
|
|
||||||
#else()
|
|
||||||
#message(FATAL_ERROR "glfw3.lib not found")
|
|
||||||
#endif()
|
|
||||||
|
|
||||||
find_package(glfw3 REQUIRED)
|
find_package(glfw3 REQUIRED)
|
||||||
|
|
||||||
# Find GLEW
|
# Find GLEW
|
||||||
|
@ -90,7 +62,6 @@ find_package(GLEW REQUIRED)
|
||||||
|
|
||||||
if(GLEW_FOUND)
|
if(GLEW_FOUND)
|
||||||
set(GLEW_INCLUDE_DIR ${GLEW_INCLUDE_DIRS})
|
set(GLEW_INCLUDE_DIR ${GLEW_INCLUDE_DIRS})
|
||||||
get_filename_component(GLEW_LIBRARIES ${GLEW_LIBRARIES} DIRECTORY)
|
|
||||||
message(STATUS "GLEW_INCLUDE_DIR: ${GLEW_INCLUDE_DIR}")
|
message(STATUS "GLEW_INCLUDE_DIR: ${GLEW_INCLUDE_DIR}")
|
||||||
message(STATUS "GLEW_LIBRARIES: ${GLEW_LIBRARIES}")
|
message(STATUS "GLEW_LIBRARIES: ${GLEW_LIBRARIES}")
|
||||||
else()
|
else()
|
||||||
|
@ -103,17 +74,10 @@ if(NOT WIN32)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Find stb_image
|
# Find stb_image
|
||||||
find_path(stb_image_INCLUDE_DIR stb_image.h
|
find_package(Stb REQUIRED)
|
||||||
HINTS
|
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/include
|
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/include/stb
|
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/lib
|
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}
|
|
||||||
"/usr/include/stb"
|
|
||||||
${stb_image_ROOT})
|
|
||||||
|
|
||||||
if(stb_image_INCLUDE_DIR)
|
if(Stb_INCLUDE_DIR)
|
||||||
message(STATUS "stb_image_INCLUDE_DIR: ${stb_image_INCLUDE_DIR}")
|
message(STATUS "Stb_INCLUDE_DIR: ${Stb_INCLUDE_DIR}")
|
||||||
else()
|
else()
|
||||||
message(FATAL_ERROR "stb_image not found")
|
message(FATAL_ERROR "stb_image not found")
|
||||||
endif()
|
endif()
|
||||||
|
@ -123,11 +87,15 @@ add_subdirectory(src)
|
||||||
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src
|
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src
|
||||||
${GLFW_INCLUDE_DIR}
|
${GLFW_INCLUDE_DIR}
|
||||||
${OPENGL_INCLUDE_DIR}
|
${OPENGL_INCLUDE_DIR}
|
||||||
${stb_image_INCLUDE_DIR}
|
${Stb_INCLUDE_DIR}
|
||||||
${GLEW_INCLUDE_DIR})
|
${GLEW_INCLUDE_DIR})
|
||||||
target_link_directories(${PROJECT_NAME} PUBLIC ${GLFW_LIB_DIR} ${GLEW_LIBRARIES})
|
target_link_directories(${PROJECT_NAME} PUBLIC ${GLFW_LIB_DIR} ${GLEW_LIBRARIES})
|
||||||
target_link_libraries(${PROJECT_NAME} glfw OpenGL::GL GLEW::GLEW)
|
|
||||||
|
|
||||||
|
if(WIN32)
|
||||||
|
target_link_libraries(${PROJECT_NAME} glfw GLEW::GLEW)
|
||||||
|
else()
|
||||||
|
target_link_libraries(${PROJECT_NAME} glfw OpenGL::GL GLEW::GLEW)
|
||||||
|
endif()
|
||||||
|
|
||||||
# Header files
|
# Header files
|
||||||
file(COPY src/ComputeEngine.h DESTINATION ${CMAKE_BINARY_DIR}/include)
|
file(COPY src/ComputeEngine.h DESTINATION ${CMAKE_BINARY_DIR}/include)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user