hashirama/uvg266
1
0
Fork 0
mirror of https://github.com/ultravideo/uvg266.git synced 2024-11-30 12:44:07 +00:00
Code Issues Actions 1 Projects Releases Wiki Activity

[build] Rename the library to avoid naming it liblibuvg266

Browse source
This commit is contained in:
Marko Viitanen 2022-04-28 16:38:56 +03:00
parent 2016f30dc0
commit 08e11ccaa9
2 changed files with 23 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
CMakeLists.txt
View file

@ -63,9 +63,9 @@ endif()
add_definitions(-DCOMPILE_INTEL) add_definitions(-DCOMPILE_INTEL)
if(USE_SHARED_LIB) if(USE_SHARED_LIB)
add_library(libuvg266 SHARED ${LIB_SOURCES}) add_library(uvg266 SHARED ${LIB_SOURCES})
else() else()
add_library(libuvg266 STATIC ${LIB_SOURCES}) add_library(uvg266 STATIC ${LIB_SOURCES})
endif() endif()
target_include_directories(libuvg266 PUBLIC src) target_include_directories(libuvg266 PUBLIC src)
@ -84,8 +84,13 @@ endif()
add_executable(uvg266 ${CLI_SOURCES}) add_executable(uvg266 ${CLI_SOURCES})
target_link_libraries(uvg266 PUBLIC libuvg266) target_link_libraries(uvg266 PUBLIC libuvg266)
set_target_properties(uvg266-bin PROPERTIES OUTPUT_NAME uvg266)
set_target_properties(uvg266-bin PROPERTIES RUNTIME_OUTPUT_NAME uvg266)
target_link_libraries(uvg266-bin PUBLIC uvg266)
if(MSVC) if(MSVC)
target_include_directories(libuvg266 PUBLIC src/threadwrapper/include) target_include_directories(uvg266 PUBLIC src/threadwrapper/include)
set_property( SOURCE ${LIB_SOURCES_STRATEGIES_AVX2} APPEND PROPERTY COMPILE_FLAGS "/arch:AVX2" ) set_property( SOURCE ${LIB_SOURCES_STRATEGIES_AVX2} APPEND PROPERTY COMPILE_FLAGS "/arch:AVX2" )
else() else()
set_property( SOURCE ${LIB_SOURCES_STRATEGIES_AVX2} APPEND PROPERTY COMPILE_FLAGS "-mavx2 -mbmi -mpopcnt -mlzcnt -mbmi2" ) set_property( SOURCE ${LIB_SOURCES_STRATEGIES_AVX2} APPEND PROPERTY COMPILE_FLAGS "-mavx2 -mbmi -mpopcnt -mlzcnt -mbmi2" )
@ -101,7 +106,7 @@ else()
set(EXTRA_LIBS ${EXTRA_LIBS} m) set(EXTRA_LIBS ${EXTRA_LIBS} m)
endif (HAVE_LIB_M) endif (HAVE_LIB_M)
target_link_libraries(uvg266 PUBLIC ${EXTRA_LIBS}) target_link_libraries(uvg266-bin PUBLIC ${EXTRA_LIBS})
endif() endif()
# INSTALL # INSTALL
@ -109,8 +114,8 @@ endif()
# ToDo: make configurable # ToDo: make configurable
install(FILES ${PROJECT_SOURCE_DIR}/src/uvg266.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pkgconfig) install(FILES ${PROJECT_SOURCE_DIR}/src/uvg266.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pkgconfig)
install(TARGETS uvg266 DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) install(TARGETS uvg266-bin DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
install(TARGETS libuvg266 DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) install(TARGETS uvg266 DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
if(USE_SHARED_LIB) # Just add the lib to the bin directory for now if(USE_SHARED_LIB) # Just add the lib to the bin directory for now
install(TARGETS libuvg266 DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) install(TARGETS libuvg266 DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
endif() endif()
@ -120,8 +125,14 @@ install(FILES ${PROJECT_SOURCE_DIR}/doc/uvg266.1 DESTINATION ${CMAKE_INSTALL_PRE
# TESTS # TESTS
if(EXISTS "${PROJECT_SOURCE_DIR}/greatest/greatest.h") if(EXISTS "${PROJECT_SOURCE_DIR}/greatest/greatest.h")
add_subdirectory( "tests/" ) add_subdirectory( "tests/" )
#enable_testing()
add_test( NAME Test_uvg266 COMMAND uvg266_tests ) add_test( NAME Test_uvg266 COMMAND uvg266_tests )
endif() endif()
if(NOT DEFINED MSVC)
add_custom_target(
check
COMMAND ${PROJECT_SOURCE_DIR}/tests/test_external_symbols.sh
COMMENT "Building and running test..."
VERBATIM
)
endif()

2
tests/CMakeLists.txt
View file

@ -37,5 +37,5 @@ endif()
add_definitions(-DCOMPILE_INTEL) add_definitions(-DCOMPILE_INTEL)
target_link_libraries(uvg266_tests PUBLIC libuvg266) target_link_libraries(uvg266_tests PUBLIC uvg266)