Gulum/DarkRP2D
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved Imgui to conan dependency management

Browse Source
This commit is contained in:
Julian Nießner
2019-01-22 18:53:20 +01:00
parent 48ee855bc9
commit 4183d47ab6
4 changed files with 522 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
CMakeLists.txt
View File

@@ -24,16 +24,6 @@ endif(NOT CMAKE_BUILD_TYPE)
MESSAGE( STATUS "PROJECT_SOURCE_DIR: " ${PROJECT_SOURCE_DIR} )
MESSAGE( STATUS "DarkRP2D_SOURCE_DIR: " ${DarkRP2D_SOURCE_DIR} )
set(DarkRP2D_EXTERNAL_DIR ${DarkRP2D_SOURCE_DIR}/external)
set(SDL2_DIR ${DarkRP2D_EXTERNAL_DIR}/SDL2-2.0.8)
set(GLEW_DIR ${DarkRP2D_EXTERNAL_DIR}/glew-2.1.0)
set(SDL2_Image_DIR ${DarkRP2D_EXTERNAL_DIR}/SDL2_image-2.0.3)
set(FREETYPE_DIR ${DarkRP2D_EXTERNAL_DIR}/freetype-2.9)
set(GLM_DIR ${DarkRP2D_EXTERNAL_DIR}/glm-0.9.9-a2)
set(BOX2D_DIR ${DarkRP2D_EXTERNAL_DIR}/Box2D-2.3.1)
set(IMGUI_DIR ${DarkRP2D_EXTERNAL_DIR}/imgui-1.60)
set(ENTITYX_DIR ${DarkRP2D_EXTERNAL_DIR}/entityx-1.1.2)
#Libs
find_package(OPENGL REQUIRED)
@@ -46,9 +36,7 @@ file(GLOB_RECURSE DarkRP2D_SOURCE_FILES ${DarkRP2D_SOURCE_DIR}/src/*.cpp)
if (${CMAKE_BUILD_TYPE} MATCHES "Debug")
# Include imgui to build
file(GLOB IMGUI_SOURCE_FILES ${IMGUI_DIR}/*.cpp)
include_directories(${IMGUI_DIR}/include)
set(DarkRP2D_SOURCE_FILES ${DarkRP2D_SOURCE_FILES} ${IMGUI_SOURCE_FILES})
# Exclude if Release
endif (${CMAKE_BUILD_TYPE} MATCHES "Debug")
add_executable(DarkRP2D ${DarkRP2D_SOURCE_FILES})
@@ -57,9 +45,9 @@ target_link_libraries(DarkRP2D
${OPENGL_gl_LIBRARY}
${CONAN_LIBS})
set (RESOURCE_DIR "${DarkRP2D_SOURCE_DIR}/resources")
add_custom_command(
TARGET ${PROJECT_NAME} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_directory ${RESOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}
COMMENT "copys resources from ${RESOURCE_DIR} => ${CMAKE_CURRENT_BINARY_DIR}"
)
#set (RESOURCE_DIR "${DarkRP2D_SOURCE_DIR}/resources")
#add_custom_command(
# TARGET ${PROJECT_NAME} POST_BUILD
# COMMAND ${CMAKE_COMMAND} -E copy_directory ${RESOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}
# COMMENT "copys resources from ${RESOURCE_DIR} => ${CMAKE_CURRENT_BINARY_DIR}"
#)