make base as library
This commit is contained in:
parent
ed1134d6d2
commit
977f0318b7
2 changed files with 14 additions and 8 deletions
|
|
@ -82,12 +82,12 @@ endif(CMAKE_COMPILER_IS_GNUCXX)
|
||||||
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
|
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
|
||||||
add_definitions(-std=c++11)
|
add_definitions(-std=c++11)
|
||||||
|
|
||||||
file(GLOB SOURCE *.cpp base/*.cpp)
|
file(GLOB SOURCE *.cpp )
|
||||||
|
|
||||||
# Function for building single example
|
# Function for building single example
|
||||||
function(buildExample EXAMPLE_NAME)
|
function(buildExample EXAMPLE_NAME)
|
||||||
# Main
|
# Main
|
||||||
file(GLOB SOURCE *.cpp base/*.cpp ${EXAMPLE_NAME}/*.cpp)
|
file(GLOB SOURCE *.cpp ${BASE_HEADERS} ${EXAMPLE_NAME}/*.cpp)
|
||||||
SET(MAIN_CPP ${EXAMPLE_NAME}/${EXAMPLE_NAME}.cpp)
|
SET(MAIN_CPP ${EXAMPLE_NAME}/${EXAMPLE_NAME}.cpp)
|
||||||
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${EXAMPLE_NAME}/main.cpp)
|
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${EXAMPLE_NAME}/main.cpp)
|
||||||
SET(MAIN_CPP ${EXAMPLE_NAME}/main.cpp)
|
SET(MAIN_CPP ${EXAMPLE_NAME}/main.cpp)
|
||||||
|
|
@ -103,10 +103,10 @@ function(buildExample EXAMPLE_NAME)
|
||||||
source_group("Shaders" FILES ${SHADERS})
|
source_group("Shaders" FILES ${SHADERS})
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
add_executable(${EXAMPLE_NAME} WIN32 ${MAIN_CPP} ${SOURCE} ${SHADERS})
|
add_executable(${EXAMPLE_NAME} WIN32 ${MAIN_CPP} ${SOURCE} ${SHADERS})
|
||||||
target_link_libraries(${EXAMPLE_NAME} ${Vulkan_LIBRARY} ${ASSIMP_LIBRARIES} ${WINLIBS})
|
target_link_libraries(${EXAMPLE_NAME} base ${Vulkan_LIBRARY} ${ASSIMP_LIBRARIES} ${WINLIBS})
|
||||||
else(WIN32)
|
else(WIN32)
|
||||||
add_executable(${EXAMPLE_NAME} ${MAIN_CPP} ${SOURCE} ${SHADERS})
|
add_executable(${EXAMPLE_NAME} ${MAIN_CPP} ${SOURCE} ${SHADERS})
|
||||||
target_link_libraries(${EXAMPLE_NAME} ${Vulkan_LIBRARY} ${ASSIMP_LIBRARIES} ${WAYLAND_CLIENT_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
|
target_link_libraries(${EXAMPLE_NAME} base )
|
||||||
endif(WIN32)
|
endif(WIN32)
|
||||||
endfunction(buildExample)
|
endfunction(buildExample)
|
||||||
|
|
||||||
|
|
@ -125,11 +125,13 @@ ENDIF(MSVC)
|
||||||
IF(WIN32)
|
IF(WIN32)
|
||||||
# Nothing here (yet)
|
# Nothing here (yet)
|
||||||
ELSE(WIN32)
|
ELSE(WIN32)
|
||||||
link_libraries(${XCB_LIBRARIES} ${Vulkan_LIBRARY})
|
link_libraries(${XCB_LIBRARIES} ${Vulkan_LIBRARY} ${Vulkan_LIBRARY} ${ASSIMP_LIBRARIES} ${WAYLAND_CLIENT_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
|
||||||
ENDIF(WIN32)
|
ENDIF(WIN32)
|
||||||
|
|
||||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/bin/")
|
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/bin/")
|
||||||
|
|
||||||
|
add_subdirectory(base)
|
||||||
|
|
||||||
set(EXAMPLES
|
set(EXAMPLES
|
||||||
bloom
|
bloom
|
||||||
computecloth
|
computecloth
|
||||||
|
|
|
||||||
4
base/CMakeLists.txt
Normal file
4
base/CMakeLists.txt
Normal file
|
|
@ -0,0 +1,4 @@
|
||||||
|
file(GLOB BASE_SRC *.cpp)
|
||||||
|
file(GLOB BASE_HEADERS *.hpp)
|
||||||
|
|
||||||
|
add_library(base SHARED ${BASE_SRC})
|
||||||
Loading…
Add table
Add a link
Reference in a new issue