Merge branch 'master' of https://git.epicsparrow.com/epicsparrow/cmaketemplate
This commit is contained in:
commit
71027babe1
@ -21,8 +21,8 @@ configure_file (
|
|||||||
|
|
||||||
#detect system and version
|
#detect system and version
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
set(LIB_DEBUG_FOLDER "libDebug/win32")
|
set(LIB_DEBUG_FOLDER "libDebug/mingw32")
|
||||||
set(LIB_RELEASE_FOLDER "libRelease/win32")
|
set(LIB_RELEASE_FOLDER "libRelease/mingw32")
|
||||||
elseif(UNIX)
|
elseif(UNIX)
|
||||||
if(${CMAKE_SYSTEM_VERSION} MATCHES "i686")
|
if(${CMAKE_SYSTEM_VERSION} MATCHES "i686")
|
||||||
set(LIB_DEBUG_FOLDER "libDebug/i686")
|
set(LIB_DEBUG_FOLDER "libDebug/i686")
|
||||||
@ -40,15 +40,15 @@ set(INCLUDE_ROOT ${DEPENDENCIES_ROOT}/include)
|
|||||||
set(LIB_DEBUG_PATH ${DEPENDENCIES_ROOT}/${LIB_DEBUG_FOLDER})
|
set(LIB_DEBUG_PATH ${DEPENDENCIES_ROOT}/${LIB_DEBUG_FOLDER})
|
||||||
set(LIB_RELEASE_PATH ${DEPENDENCIES_ROOT}/${LIB_RELEASE_FOLDER})
|
set(LIB_RELEASE_PATH ${DEPENDENCIES_ROOT}/${LIB_RELEASE_FOLDER})
|
||||||
|
|
||||||
if(${CMAKE_DEBUG_TYPE} MATCHES "Debug")
|
if(${CMAKE_BUILD_TYPE} MATCHES "Debug")
|
||||||
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LIB_DEBUG_FOLDER}) #for STATIC
|
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LIB_DEBUG_PATH}) #for STATIC
|
||||||
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LIB_DEBUG_FOLDER}) #for SHARED
|
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LIB_DEBUG_PATH}) #for SHARED
|
||||||
|
|
||||||
list(APPEND LIB_PATHS ${LIB_DEBUG_PATH})
|
list(APPEND LIB_PATHS ${LIB_DEBUG_PATH})
|
||||||
list(APPEND LIB_PATHS "\n" ${LIB_RELEASE_PATH})
|
list(APPEND LIB_PATHS "\n" ${LIB_RELEASE_PATH})
|
||||||
else()
|
else()
|
||||||
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LIB_RELEASE_FOLDER}) #for STATIC
|
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LIB_RELEASE_PATH}) #for STATIC
|
||||||
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LIB_RELEASE_FOLDER}) #for SHARED
|
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LIB_RELEASE_PATH}) #for SHARED
|
||||||
|
|
||||||
list(APPEND LIB_PATHS ${LIB_RELEASE_PATH})
|
list(APPEND LIB_PATHS ${LIB_RELEASE_PATH})
|
||||||
endif()
|
endif()
|
||||||
@ -57,14 +57,14 @@ endif()
|
|||||||
if(LIB_SRC_LIST)
|
if(LIB_SRC_LIST)
|
||||||
set(IS_LIBRARY True)
|
set(IS_LIBRARY True)
|
||||||
set(LIBRARY_NAME ${PROJECT_NAME})
|
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)
|
if(EXEC_SRC_LIST)
|
||||||
set(EXECUTABLE_NAME "test${PROJECT_NAME}")
|
set(EXECUTABLE_NAME "test${PROJECT_NAME}")
|
||||||
add_executable(${EXECUTABLE_NAME} ${EXEC_SRC_LIST})
|
add_executable(${EXECUTABLE_NAME} ${EXEC_SRC_LIST} ${RESOURCES_FILES})
|
||||||
endif()
|
endif()
|
||||||
elseif(EXEC_SRC_LIST)
|
elseif(EXEC_SRC_LIST)
|
||||||
set(EXECUTABLE_NAME "${PROJECT_NAME}")
|
set(EXECUTABLE_NAME "${PROJECT_NAME}")
|
||||||
add_executable(${EXECUTABLE_NAME} ${EXEC_SRC_LIST})
|
add_executable(${EXECUTABLE_NAME} ${EXEC_SRC_LIST} ${RESOURCES_FILES})
|
||||||
else()
|
else()
|
||||||
message(WARNING "NO SOURCE FILE PROVIDED")
|
message(WARNING "NO SOURCE FILE PROVIDED")
|
||||||
endif()
|
endif()
|
||||||
@ -96,28 +96,33 @@ if(USE_SFML)
|
|||||||
PATHS
|
PATHS
|
||||||
${LIB_PATHS}
|
${LIB_PATHS}
|
||||||
)
|
)
|
||||||
|
|
||||||
find_library(SFML_LIBRARY_AUDIO
|
find_library(SFML_LIBRARY_AUDIO
|
||||||
NAMES
|
NAMES
|
||||||
sfml-audio
|
sfml-audio
|
||||||
PATHS
|
PATHS
|
||||||
${LIB_PATHS}
|
${LIB_PATHS}
|
||||||
)
|
)
|
||||||
|
|
||||||
find_library(SFML_LIBRARY_GRAPHICS
|
find_library(SFML_LIBRARY_GRAPHICS
|
||||||
NAMES
|
NAMES
|
||||||
sfml-graphics
|
sfml-graphics
|
||||||
PATHS
|
PATHS
|
||||||
${LIB_PATHS}
|
${LIB_PATHS}
|
||||||
)
|
)
|
||||||
LIST(APPEND LIB_DEPENDENCIES_LIST ${SFML_LIBRARY_WINDOW} ${SFML_LIBRARY_SYSTEM} ${SFML_LIBRARY_AUDIO} ${SFML_LIBRARY_GRAPHICS)
|
|
||||||
|
add_definitions(-DSFML_STATIC)
|
||||||
|
LIST(APPEND LIB_DEPENDENCIES_LIST ${SFML_LIBRARY_AUDIO} ${SFML_LIBRARY_GRAPHICS} ${SFML_LIBRARY_WINDOW} ${SFML_LIBRARY_SYSTEM})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(USE_RENDERER)
|
if(USE_RENDERER)
|
||||||
find_library(SPARROW_RENDERER_LIBRARY
|
find_library(SPARROW_RENDERER_LIBRARY
|
||||||
NAMES
|
NAMES
|
||||||
sparrowrenderer
|
SparrowRenderer
|
||||||
PATHS
|
PATHS
|
||||||
${LIB_PATHS}
|
${LIB_PATHS}
|
||||||
)
|
)
|
||||||
|
LIST(APPEND INCLUDE_PATHS "\n" ${PROJECT_SOURCE_DIR}/../sparrowrenderer/src)
|
||||||
LIST(APPEND LIB_DEPENDENCIES_LIST ${SPARROW_RENDERER_LIBRARY})
|
LIST(APPEND LIB_DEPENDENCIES_LIST ${SPARROW_RENDERER_LIBRARY})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
@ -128,6 +133,7 @@ if(USE_INPUT)
|
|||||||
PATHS
|
PATHS
|
||||||
${LIB_PATHS}
|
${LIB_PATHS}
|
||||||
)
|
)
|
||||||
|
LIST(APPEND INCLUDE_PATHS "\n" ${PROJECT_SOURCE_DIR}/../sparrowinput/src)
|
||||||
LIST(APPEND LIB_DEPENDENCIES_LIST ${SPARROW_INPUT_LIBRARY})
|
LIST(APPEND LIB_DEPENDENCIES_LIST ${SPARROW_INPUT_LIBRARY})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user