Skip to content

Commit 43eea0c

Browse files
committed
2.5.2
1 parent c31f15c commit 43eea0c

File tree

4 files changed

+9
-45
lines changed

4 files changed

+9
-45
lines changed

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
./build
2-
./cmake-build-debug
1+
/build
2+
/cmake-build-debug
33

44
.DS_Store

.idea/misc.xml

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

CMakeLists.txt

Lines changed: 2 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,13 @@
11
# MARK: - 1. Preface
22
cmake_minimum_required(VERSION 3.28)
3-
set(PROJECT_VERSION 2.5.1)
4-
set(PROJECT_NAME jbigkit)
5-
project(${PROJECT_NAME} VERSION ${PROJECT_VERSION} LANGUAGES C)
6-
set(PACKAGE_CONFIGNAME ${PROJECT_NAME})
7-
set(PACKAGE_VERSION ${PROJECT_VERSION})
3+
project(jbigkit VERSION 2.5.2 LANGUAGES C)
84

95

106
# MARK: - 2. General
117
set(CMAKE_C_STANDARD 17)
128

139
include_directories(src/include)
1410

15-
# @TODO+:Slava -> Better explain why this is needed. For configuration files generation I suppose?
16-
include(GNUInstallDirs)
17-
set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR})
18-
set(LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR})
19-
set(BIN_INSTALL_DIR ${CMAKE_INSTALL_BINDIR})
20-
2111

2212
# MARK: - 3. Libraries
2313
add_library(libjbig SHARED src/lib/jbig.c src/lib/jbig_ar.c)
@@ -54,33 +44,11 @@ if(INSTALL_APPS)
5444
endif()
5545

5646

57-
# MARK: - 5. config.cmake Generation
58-
include(CMakePackageConfigHelpers)
59-
60-
configure_package_config_file(
61-
${PACKAGE_CONFIGNAME}-config.cmake.in
62-
${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_CONFIGNAME}-config.cmake
63-
INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${EXPORT_NAME}
64-
PATH_VARS INCLUDE_INSTALL_DIR LIB_INSTALL_DIR BIN_INSTALL_DIR
65-
)
66-
write_basic_package_version_file(
67-
${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_CONFIGNAME}-config-version.cmake
68-
VERSION ${PACKAGE_VERSION}
69-
COMPATIBILITY AnyNewerVersion
70-
)
71-
72-
73-
# MARK: - 6. Targets
47+
# MARK: - 5. Targets
7448
install(
7549
TARGETS ${JBIGKIT_TARGETS}
7650
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
7751
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
7852
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
7953
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
8054
)
81-
82-
install(
83-
FILES ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_CONFIGNAME}-config.cmake
84-
${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_CONFIGNAME}-config-version.cmake
85-
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${EXPORT_NAME}
86-
)

jbigkit-config.cmake.in

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)