cmake: Fix building and improve generated projects

This commit is contained in:
Michael Fabian Dirks 2017-08-19 23:47:30 +02:00
parent 90138ef636
commit 986d788d25

View file

@ -41,13 +41,26 @@ SET(obs-stream-effects_SOURCES
"${PROJECT_SOURCE_DIR}/source/filter-transform.cpp" "${PROJECT_SOURCE_DIR}/source/filter-transform.cpp"
"${PROJECT_SOURCE_DIR}/source/gs-helper.cpp" "${PROJECT_SOURCE_DIR}/source/gs-helper.cpp"
) )
SET(obs-stream-effects_LOCALE
"${PROJECT_SOURCE_DIR}/data/locale/en-US.ini"
)
SET(obs-stream-effects_EFFECTS
"${PROJECT_SOURCE_DIR}/data/effects/bilateral-blur.effect"
"${PROJECT_SOURCE_DIR}/data/effects/box-blur.effect"
"${PROJECT_SOURCE_DIR}/data/effects/gaussian-blur.effect"
"${PROJECT_SOURCE_DIR}/data/effects/displace.effect"
"${PROJECT_SOURCE_DIR}/data/effects/color-conversion.effect"
)
SET(obs-stream-effects_LIBRARIES SET(obs-stream-effects_LIBRARIES
) )
#set_property(GLOBAL PROPERTY USE_FOLDERS ON)
source_group("Data Files\\Locale" FILES ${obs-stream-effects_LOCALE})
source_group("Data Files\\Effects" FILES ${obs-stream-effects_EFFECTS})
################################################################################ ################################################################################
# Standalone and OBS Studio Build Data # Standalone and OBS Studio Build Data
################################################################################ ################################################################################
if(TARGET obs-studio) if(TARGET libobs)
# OBS Studio Specific # OBS Studio Specific
# Directories # Directories
@ -93,28 +106,30 @@ endif()
ADD_LIBRARY(obs-stream-effects MODULE ADD_LIBRARY(obs-stream-effects MODULE
${obs-stream-effects_HEADERS} ${obs-stream-effects_HEADERS}
${obs-stream-effects_SOURCES} ${obs-stream-effects_SOURCES}
${obs-stream-effects_LOCALE}
${obs-stream-effects_EFFECTS}
) )
TARGET_LINK_LIBRARIES(obs-stream-effects TARGET_LINK_LIBRARIES(obs-stream-effects
${LIBOBS_LIBRARIES} ${LIBOBS_LIBRARIES}
${obs-stream-effects_LIBRARIES} ${obs-stream-effects_LIBRARIES}
) )
# All Warnings, Extra Warnings, Pedantic if(TARGET libobs)
if(MSVC) install_obs_plugin_with_data(obs-stream-effects data)
else()
# All Warnings, Extra Warnings, Pedantic
if(MSVC)
# Force to always compile with W4 # Force to always compile with W4
if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]") if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
else() else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
endif() endif()
elseif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) elseif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
# Update if necessary # Update if necessary
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long -pedantic") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long -pedantic")
endif() endif()
if(DepsPath)
install_obs_plugin_with_data(obs-stream-effects data)
else()
math(EXPR BITS "8*${CMAKE_SIZEOF_VOID_P}") math(EXPR BITS "8*${CMAKE_SIZEOF_VOID_P}")
add_custom_command(TARGET obs-stream-effects POST_BUILD add_custom_command(TARGET obs-stream-effects POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_directory COMMAND ${CMAKE_COMMAND} -E copy_directory