Skip to content

Commit 650213d

Browse files
committed
Move docs target to a separate component so that docs can be installed without the library
1 parent bf835ac commit 650213d

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,7 @@ if(BUILD_DOCS)
328328
DIRECTORY ${DOXYGEN_BUILD_DIR}/
329329
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/ephotosynthesis
330330
OPTIONAL
331+
COMPONENT docs
331332
)
332333
endif()
333334

@@ -553,11 +554,13 @@ if(BUILD_PYTHON)
553554
TARGETS ${PYTHON_LIBRARY_NAME}
554555
DESTINATION "${EPHOTOSYNTHESIS_INSTALL_PYTHONDIR}"
555556
COMPONENT Python
557+
EXCLUDE_FROM_ALL
556558
)
557559
configure_file(cmake/__init__.py.in __init__.py @ONLY)
558560
install(
559561
FILES ${CMAKE_CURRENT_BINARY_DIR}/__init__.py
560562
DESTINATION "${EPHOTOSYNTHESIS_INSTALL_PYTHONDIR}"
561563
COMPONENT Python
564+
EXCLUDE_FROM_ALL
562565
)
563566
endif()

scripts/devtasks.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,14 +91,15 @@ def adjust_args(cls, args):
9191
class BuildSubTask(SubTask):
9292

9393
def __init__(self, args, config_args=None, build_args=None,
94-
build_kwargs=None, build_env=None, **kwargs):
94+
install_args=None, build_kwargs=None, build_env=None,
95+
**kwargs):
9596
self.adjust_args(args)
9697
if build_kwargs is None:
9798
build_kwargs = {}
9899
build_kwargs.setdefault('env', build_env)
99100
if not args.dont_build:
100101
build(args, config_args=config_args, build_args=build_args,
101-
**build_kwargs)
102+
install_args=install_args, **build_kwargs)
102103
kwargs.setdefault('cwd', args.build_dir)
103104
super(BuildSubTask, self).__init__(args, **kwargs)
104105

@@ -316,7 +317,8 @@ def __init__(self, args, config_args=None, build_args=None):
316317

317318
class docs(BuildSubTask):
318319

319-
def __init__(self, args, config_args=None, build_args=None):
320+
def __init__(self, args, config_args=None, build_args=None,
321+
install_args=None):
320322
args.with_asan = False
321323
args.build_type = 'Debug'
322324
args.dont_build = False
@@ -325,11 +327,15 @@ def __init__(self, args, config_args=None, build_args=None):
325327
config_args = []
326328
if build_args is None:
327329
build_args = []
330+
if install_args is None:
331+
install_args = []
328332
config_args += ['-DBUILD_DOCS=ON', '-DDOXYGEN_CHECK_MISSING=ON']
329333
build_args += ['--target', 'docs']
334+
install_args += ['--component', 'docs']
330335
super(docs, self).__init__(
331336
args, config_args=config_args,
332337
build_args=build_args,
338+
install_args=install_args,
333339
)
334340

335341

0 commit comments

Comments
 (0)