Personal/ComputeEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

merge into: Personal:windows-static-libs
Branches Tags
Personal:main
Personal:windows-shared-libs
Personal:windows-static-libs
...
pull from: Personal:main
Branches Tags
Personal:main
Personal:windows-shared-libs
Personal:windows-static-libs

3 Commits
windows-st ... main

Author SHA1 Message Date
Dawid Pietrykowski
24064274c5 CMakeLists.txt fixes 2023-06-05 19:48:21 +02:00
Dawid Pietrykowski
90268c3e43 More windows build fixes 2023-06-05 19:43:23 +02:00
Dawid Pietrykowski
b7a9ac3e93 Added find_package for stb 2023-06-05 19:27:52 +02:00
1 changed files with 9 additions and 41 deletions
Show Stats Expand all files Collapse all files

50
CMakeLists.txt
View File

@ -55,34 +55,6 @@ set(GLFW_BUILD_DOCS OFF CACHE BOOL "" FORCE)
set(GLFW_BUILD_TESTS 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 GLEW
@ -90,7 +62,6 @@ find_package(GLEW REQUIRED)
if(GLEW_FOUND)
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_LIBRARIES: ${GLEW_LIBRARIES}")
else()
@ -103,17 +74,10 @@ if(NOT WIN32)
endif()
# Find stb_image
find_path(stb_image_INCLUDE_DIR stb_image.h
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})
find_package(Stb REQUIRED)
if(stb_image_INCLUDE_DIR)
message(STATUS "stb_image_INCLUDE_DIR: ${stb_image_INCLUDE_DIR}")
if(Stb_INCLUDE_DIR)
message(STATUS "Stb_INCLUDE_DIR: ${Stb_INCLUDE_DIR}")
else()
message(FATAL_ERROR "stb_image not found")
endif()
@ -123,11 +87,15 @@ add_subdirectory(src)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src
${GLFW_INCLUDE_DIR}
${OPENGL_INCLUDE_DIR}
${stb_image_INCLUDE_DIR}
${Stb_INCLUDE_DIR}
${GLEW_INCLUDE_DIR})
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
file(COPY src/ComputeEngine.h DESTINATION ${CMAKE_BINARY_DIR}/include)