Skip to content

CMake fixes #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
robUx4 merged 3 commits into from
May 19, 2019
Merged

CMake fixes #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e13b541
CMake fixes
evpobr May 5, 2019
fbb05c0
Mark KaxInternalBlock as exported
evpobr May 18, 2019
f9e5fda
Fix C++ visibility preset
evpobr May 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ project(matroska VERSION 1.5.0)
option(DISABLE_PKGCONFIG "Disable PkgConfig module generation" OFF)
option(DISABLE_CMAKE_CONFIG "Disable CMake package config module generation" OFF)

find_package(Ebml 1.3.7 REQUIRED)
find_package(EBML 1.3.7 REQUIRED)

include(GNUInstallDirs)

Expand Down Expand Up @@ -60,7 +60,7 @@ set (libmatroska_C_PUBLIC_HEADERS
matroska/c/libmatroska_t.h)

add_library(matroska ${libmatroska_SOURCES} ${limatroska_PUBLIC_HEADERS} ${libmatroska_C_PUBLIC_HEADERS})
target_link_libraries(matroska PUBLIC ebml)
target_link_libraries(matroska PUBLIC EBML::ebml)
set_target_properties(matroska PROPERTIES
VERSION 6.0.0
SOVERSION 6)
Expand All @@ -72,7 +72,10 @@ if(MSVC)
endif()
if(BUILD_SHARED_LIBS)
target_compile_definitions(matroska PUBLIC MATROSKA_DLL)
set_target_properties(matroska PROPERTIES DEFINE_SYMBOL "MATROSKA_DLL_EXPORT")
set_target_properties(matroska PROPERTIES
DEFINE_SYMBOL "MATROSKA_DLL_EXPORT"
CXX_VISIBILITY_PRESET hidden
VISIBILITY_INLINES_HIDDEN 1)
endif()

install(TARGETS matroska
Expand All @@ -95,16 +98,14 @@ if(NOT DISABLE_PKGCONFIG)
endif()

if(NOT DISABLE_CMAKE_CONFIG)
if(WIN32)
set(CMAKE_INSTALL_PACKAGEDIR cmake)
else()
set(CMAKE_INSTALL_PACKAGEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
endif()
set(CMAKE_INSTALL_PACKAGEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/Matroska)
include(CMakePackageConfigHelpers)
configure_package_config_file(MatroskaConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/MatroskaConfig.cmake
INSTALL_DESTINATION ${CMAKE_INSTALL_PACKAGEDIR})
write_basic_package_version_file(MatroskaConfigVersion.cmake COMPATIBILITY SameMajorVersion)
install(EXPORT MatroskaTargets DESTINATION ${CMAKE_INSTALL_PACKAGEDIR})
install(EXPORT MatroskaTargets NAMESPACE Matroska:: DESTINATION ${CMAKE_INSTALL_PACKAGEDIR})
install(FILES
${CMAKE_CURRENT_SOURCE_DIR}/MatroskaConfig.cmake
${CMAKE_CURRENT_BINARY_DIR}/MatroskaConfig.cmake
${CMAKE_CURRENT_BINARY_DIR}/MatroskaConfigVersion.cmake
DESTINATION ${CMAKE_INSTALL_PACKAGEDIR})
endif()
1 change: 0 additions & 1 deletion MatroskaConfig.cmake
View file
Open in desktop

This file was deleted.

8 changes: 8 additions & 0 deletions MatroskaConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
@PACKAGE_INIT@

include(CMakeFindDependencyMacro)
find_dependency(EBML REQUIRED)

include(${CMAKE_CURRENT_LIST_DIR}/MatroskaTargets.cmake)

check_required_components(Matroska)
2 changes: 1 addition & 1 deletion matroska/KaxBlock.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ DECLARE_MKX_MASTER(KaxBlockGroup)
const KaxTrackEntry * ParentTrack;
};

class KaxInternalBlock : public EbmlBinary {
class MATROSKA_DLL_API KaxInternalBlock : public EbmlBinary {
public:
KaxInternalBlock(EBML_DEF_CONS EBML_DEF_SEP bool bSimple EBML_DEF_SEP EBML_EXTRA_PARAM) :EBML_DEF_BINARY_INIT EBML_DEF_SEP bLocalTimecodeUsed(false), mLacing(LACING_AUTO), mInvisible(false)
,ParentCluster(NULL), bIsSimple(bSimple), bIsKeyframe(true), bIsDiscardable(false)
Expand Down