fixed lib output path, added resource_files variable (for shaders)
This commit is contained in:
parent
246744b72a
commit
114d10c5cd
@ -15,8 +15,8 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
||||
|
||||
#detect system and version
|
||||
if(WIN32)
|
||||
set(LIB_DEBUG_FOLDER "libDebug/win32")
|
||||
set(LIB_RELEASE_FOLDER "libRelease/win32")
|
||||
set(LIB_DEBUG_FOLDER "libDebug/mingw32")
|
||||
set(LIB_RELEASE_FOLDER "libRelease/mingw32")
|
||||
elseif(UNIX)
|
||||
if(${CMAKE_SYSTEM_VERSION} MATCHES "i686")
|
||||
set(LIB_DEBUG_FOLDER "libDebug/i686")
|
||||
@ -34,15 +34,15 @@ set(INCLUDE_ROOT ${DEPENDENCIES_ROOT}/include)
|
||||
set(LIB_DEBUG_PATH ${DEPENDENCIES_ROOT}/${LIB_DEBUG_FOLDER})
|
||||
set(LIB_RELEASE_PATH ${DEPENDENCIES_ROOT}/${LIB_RELEASE_FOLDER})
|
||||
|
||||
if(${CMAKE_DEBUG_TYPE} MATCHES "Debug")
|
||||
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LIB_DEBUG_FOLDER}) #for STATIC
|
||||
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LIB_DEBUG_FOLDER}) #for SHARED
|
||||
if(${CMAKE_BUILD_TYPE} MATCHES "Debug")
|
||||
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LIB_DEBUG_PATH}) #for STATIC
|
||||
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LIB_DEBUG_PATH}) #for SHARED
|
||||
|
||||
list(APPEND LIB_PATHS ${LIB_DEBUG_PATH})
|
||||
list(APPEND LIB_PATHS "\n" ${LIB_RELEASE_PATH})
|
||||
else()
|
||||
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LIB_RELEASE_FOLDER}) #for STATIC
|
||||
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LIB_RELEASE_FOLDER}) #for SHARED
|
||||
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LIB_RELEASE_PATH}) #for STATIC
|
||||
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LIB_RELEASE_PATH}) #for SHARED
|
||||
|
||||
list(APPEND LIB_PATHS ${LIB_RELEASE_PATH})
|
||||
endif()
|
||||
@ -51,14 +51,14 @@ endif()
|
||||
if(LIB_SRC_LIST)
|
||||
set(IS_LIBRARY True)
|
||||
set(LIBRARY_NAME ${PROJECT_NAME})
|
||||
add_library(${LIBRARY_NAME} STATIC ${LIB_SRC_LIST})
|
||||
add_library(${LIBRARY_NAME} STATIC ${LIB_SRC_LIST} ${RESOURCES_FILES})
|
||||
if(EXEC_SRC_LIST)
|
||||
set(EXECUTABLE_NAME "test${PROJECT_NAME}")
|
||||
add_executable(${EXECUTABLE_NAME} ${EXEC_SRC_LIST})
|
||||
add_executable(${EXECUTABLE_NAME} ${EXEC_SRC_LIST} ${RESOURCES_FILES})
|
||||
endif()
|
||||
elseif(EXEC_SRC_LIST)
|
||||
set(EXECUTABLE_NAME "${PROJECT_NAME}")
|
||||
add_executable(${EXECUTABLE_NAME} ${EXEC_SRC_LIST})
|
||||
add_executable(${EXECUTABLE_NAME} ${EXEC_SRC_LIST} ${RESOURCES_FILES})
|
||||
else()
|
||||
message(WARNING "NO SOURCE FILE PROVIDED")
|
||||
endif()
|
||||
|
Loading…
x
Reference in New Issue
Block a user