lenn/LearnOpenGL
1
0
Fork 0
mirror of https://github.com/JoeyDeVries/LearnOpenGL.git synced 2026-01-05 16:23:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

changed Win32 and Unix method for copying shaders and executables

Browse Source
This commit is contained in:
zmertens
2015-04-02 13:48:28 -07:00
parent 3d71a928ce
commit ea910a55ca
1 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
CMakeLists.txt
View File

@@ -9,7 +9,11 @@ IF(NOT CMAKE_BUILD_TYPE)
ENDIF(NOT CMAKE_BUILD_TYPE) ENDIF(NOT CMAKE_BUILD_TYPE)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/") set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/")
if(WIN32)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
endif(WIN32)
link_directories(${CMAKE_SOURCE_DIR}/lib) link_directories(${CMAKE_SOURCE_DIR}/lib)
list(APPEND CMAKE_CXX_FLAGS "-std=c++11") list(APPEND CMAKE_CXX_FLAGS "-std=c++11")
@@ -48,7 +52,7 @@ elseif (UNIX)
list(APPEND LIBS ${ASSIMP_LIBRARY}) list(APPEND LIBS ${ASSIMP_LIBRARY})
else() else()
set(LIBS ) set(LIBS )
endif() endif(WIN32)
IF(APPLE) IF(APPLE)
INCLUDE_DIRECTORIES(/System/Library/Frameworks) INCLUDE_DIRECTORIES(/System/Library/Frameworks)
@@ -113,10 +117,9 @@ foreach(CHAPTER ${CHAPTERS})
) )
add_executable(${DEMO} ${SOURCE}) add_executable(${DEMO} ${SOURCE})
target_link_libraries(${DEMO} ${LIBS}) target_link_libraries(${DEMO} ${LIBS})
set_target_properties(${DEMO} if(WIN32)
PROPERTIES set_target_properties(${DEMO} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/bin/${CHAPTER}")
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/bin/bin/${CHAPTER}" endif(WIN32)
)
# copy shader files to build directory # copy shader files to build directory
file(GLOB SHADERS file(GLOB SHADERS
"src/${CHAPTER}/${DEMO}/*.vs" "src/${CHAPTER}/${DEMO}/*.vs"
@@ -124,10 +127,13 @@ foreach(CHAPTER ${CHAPTERS})
"src/${CHAPTER}/${DEMO}/*.gs" "src/${CHAPTER}/${DEMO}/*.gs"
) )
foreach(SHADER ${SHADERS}) foreach(SHADER ${SHADERS})
if(WIN32)
# configure_file(${SHADER} "test") # configure_file(${SHADER} "test")
add_custom_command(TARGET ${DEMO} PRE_BUILD add_custom_command(TARGET ${DEMO} PRE_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${SHADER} $<TARGET_FILE_DIR:${DEMO}>)
COMMAND ${CMAKE_COMMAND} -E elseif(UNIX)
copy ${SHADER} $<TARGET_FILE_DIR:${DEMO}>) file(COPY ${SHADER} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
endif(WIN32)
endforeach(SHADER) endforeach(SHADER)
# if compiling for visual studio, also use configure file for each project (specifically to setup working directory) # if compiling for visual studio, also use configure file for each project (specifically to setup working directory)
if(MSVC) if(MSVC)
@@ -138,4 +144,7 @@ endforeach(CHAPTER)
include_directories(${CMAKE_SOURCE_DIR}/includes) include_directories(${CMAKE_SOURCE_DIR}/includes)
if(UNIX)
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/resources DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
endif(UNIX)