Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitdb08b2f

Browse files
author
Clement Champetier
committed
CMake: the install rule does not depend on all
* "make install" does not imply "make all install".* Update Travis to build all the project, and install.* CMake install with 'Optional': Specify that it is not an error if thefile to be installed does not exist.
1 parentc59b98b commitdb08b2f

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

‎.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ script:
3737
-mkdir -p ${AVTRANSCODER_BUILD}
3838
-cd ${AVTRANSCODER_BUILD}
3939
-cmake .. -DCMAKE_INSTALL_PREFIX=${AVTRANSCODER_INSTALL} -DCMAKE_PREFIX_PATH=${DEPENDENCY_INSTALL} -DCMAKE_BUILD_TYPE=Release -DAVTRANSCODER_PYTHON_VERSION_OF_BINDING=2.7 -DAVTRANSCODER_COVERAGE=True
40-
-make -j${CI_NODE_TOTAL} install
40+
-make -j${CI_NODE_TOTAL}
41+
-make install
4142

4243
# launch tests
4344
-if [ ${DEPENDENCY_MODE} = "ffmpeg" ]; then ./../tools/travis.python.nosetests.sh; fi

‎CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ add_definitions(-DAVTRANSCODER_DEFAULT_AVPROFILES="${CMAKE_INSTALL_PREFIX}/share
1919
# Diplay commands being ran by CMake
2020
set(CMAKE_VERBOSE_MAKEFILEOFF)
2121

22+
# The install rule does not depend on all, i.e. everything will not be built before installing
23+
set(CMAKE_SKIP_INSTALL_ALL_DEPENDENCYTRUE)
24+
2225
# CPP flags on debug / release mode
2326
if(MSVC)
2427
set(CMAKE_CXX_FLAGS_DEBUG"${CMAKE_CXX_FLAGS_DEBUG} /MTd")

‎src/CMakeLists.txt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ install(
4949
PATTERN"*.hpp"
5050
PATTERN"*.i"
5151
)
52-
install(TARGETSavtranscoder-staticDESTINATIONlib/)
53-
install(TARGETSavtranscoder-sharedDESTINATIONlib/)
52+
install(TARGETSavtranscoder-staticDESTINATIONlib/OPTIONAL)
53+
install(TARGETSavtranscoder-sharedDESTINATIONlib/OPTIONAL)
5454

5555
### Install AvTranscoder ressource
5656
install(
@@ -110,9 +110,10 @@ if(SWIG_FOUND)
110110
install(
111111
FILES${AVTRANSCODER_PYTHON_BINDING_FILE}${AVTRANSCODER_PYTHON_INIT_FILE}
112112
DESTINATION${AVTRANSCODER_PYTHON_MODULE_OUTPUT_DIR}
113+
OPTIONAL
113114
)
114115
# Install python lib and __init__.py files
115-
install(TARGETS${SWIG_MODULE_avtranscoder-py_REAL_NAME}DESTINATION"lib/python${PYTHONLIBS_VERSION_STRING}/site-packages/pyAvTranscoder/")
116+
install(TARGETS${SWIG_MODULE_avtranscoder-py_REAL_NAME}DESTINATION"lib/python${PYTHONLIBS_VERSION_STRING}/site-packages/pyAvTranscoder/"OPTIONAL)
116117
install(CODE"file(WRITE${CMAKE_INSTALL_PREFIX}/${AVTRANSCODER_PYTHON_MODULE_OUTPUT_DIR}/__init__.py)")
117118
else()
118119
message("PYTHON not found, will not build python binding.")
@@ -166,8 +167,8 @@ if(SWIG_FOUND)
166167
)
167168

168169
# Install java lib and jar files
169-
install(TARGETS${SWIG_MODULE_avtranscoder-java_REAL_NAME}DESTINATION"lib/java")
170-
install(FILES${AVTRANSCODER_JAR_PATH}/${AVTRANSCODER_JAR_NAME}DESTINATION"share/java/")
170+
install(TARGETS${SWIG_MODULE_avtranscoder-java_REAL_NAME}DESTINATION"lib/java"OPTIONAL)
171+
install(FILES${AVTRANSCODER_JAR_PATH}/${AVTRANSCODER_JAR_NAME}DESTINATION"share/java/"OPTIONAL)
171172
else()
172173
message("JAVA not found, will not build java binding.")
173174
endif()

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp