Merge pull request #188 from cchampet/cmake_installDoesNotDependOnAll

valnoel · valnoel · commit f44f3c36a7ff · 2015-06-09T15:54:04.000+02:00
CMake: the install rule does not depend on all
diff --git a/.travis.yml b/.travis.yml
@@ -37,7 +37,8 @@ script:
   - mkdir -p ${AVTRANSCODER_BUILD}
   - cd ${AVTRANSCODER_BUILD}
   - 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
-  - make -j${CI_NODE_TOTAL} install
+  - make -j${CI_NODE_TOTAL}
+  - make install
 
   # launch tests
   - if [ ${DEPENDENCY_MODE} = "ffmpeg" ]; then ./../tools/travis.python.nosetests.sh; fi
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -19,6 +19,9 @@ add_definitions(-DAVTRANSCODER_DEFAULT_AVPROFILES="${CMAKE_INSTALL_PREFIX}/share
 # Diplay commands being ran by CMake
 set(CMAKE_VERBOSE_MAKEFILE OFF)
 
+# The install rule does not depend on all, i.e. everything will not be built before installing
+set(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY TRUE)
+
 # CPP flags on debug / release mode
 if(MSVC)
 	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
diff --git a/app/avInfo/CMakeLists.txt b/app/avInfo/CMakeLists.txt
@@ -20,6 +20,7 @@ install(
 	FILES ${BINARY_FILES}
 	PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
 	DESTINATION "bin/"
+	OPTIONAL
 )
 
 install(
diff --git a/app/avMeta/CMakeLists.txt b/app/avMeta/CMakeLists.txt
@@ -20,6 +20,7 @@ install(
 	FILES ${BINARY_FILES}
 	PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
 	DESTINATION "bin/"
+	OPTIONAL
 )
 
 install(
diff --git a/app/avPlay/CMakeLists.txt b/app/avPlay/CMakeLists.txt
@@ -42,6 +42,7 @@ install(
 	FILES ${BINARY_FILES}
 	PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
 	DESTINATION "bin/"
+	OPTIONAL
 )
 
 install(
diff --git a/app/avProcessor/CMakeLists.txt b/app/avProcessor/CMakeLists.txt
@@ -20,6 +20,7 @@ install(
 	FILES ${BINARY_FILES}
 	PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
 	DESTINATION "bin/"
+	OPTIONAL
 )
 
 install(
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -49,8 +49,8 @@ install(
 	PATTERN "*.hpp"
 	PATTERN "*.i"
 )
-install(TARGETS avtranscoder-static DESTINATION lib/)
-install(TARGETS avtranscoder-shared DESTINATION lib/)
+install(TARGETS avtranscoder-static DESTINATION lib/ OPTIONAL)
+install(TARGETS avtranscoder-shared DESTINATION lib/ OPTIONAL)
 
 ### Install AvTranscoder ressource
 install(
@@ -110,9 +110,10 @@ if(SWIG_FOUND)
 			install(
 				FILES ${AVTRANSCODER_PYTHON_BINDING_FILE} ${AVTRANSCODER_PYTHON_INIT_FILE}
 				DESTINATION ${AVTRANSCODER_PYTHON_MODULE_OUTPUT_DIR}
+				OPTIONAL
 			)
 			# Install python lib and __init__.py files
-			install(TARGETS ${SWIG_MODULE_avtranscoder-py_REAL_NAME} DESTINATION "lib/python${PYTHONLIBS_VERSION_STRING}/site-packages/pyAvTranscoder/")
+			install(TARGETS ${SWIG_MODULE_avtranscoder-py_REAL_NAME} DESTINATION "lib/python${PYTHONLIBS_VERSION_STRING}/site-packages/pyAvTranscoder/" OPTIONAL)
 			install(CODE "file(WRITE ${CMAKE_INSTALL_PREFIX}/${AVTRANSCODER_PYTHON_MODULE_OUTPUT_DIR}/__init__.py)")
 		else()
 			message("PYTHON not found, will not build python binding.")
@@ -166,8 +167,8 @@ if(SWIG_FOUND)
 			)
 
 			# Install java lib and jar files
-			install(TARGETS ${SWIG_MODULE_avtranscoder-java_REAL_NAME} DESTINATION "lib/java")
-			install(FILES ${AVTRANSCODER_JAR_PATH}/${AVTRANSCODER_JAR_NAME} DESTINATION "share/java/")
+			install(TARGETS ${SWIG_MODULE_avtranscoder-java_REAL_NAME} DESTINATION "lib/java" OPTIONAL)
+			install(FILES ${AVTRANSCODER_JAR_PATH}/${AVTRANSCODER_JAR_NAME} DESTINATION "share/java/" OPTIONAL)
 		else()
 			message("JAVA not found, will not build java binding.")
 		endif()

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ install(`
`20`	`20`	`FILES ${BINARY_FILES}`
`21`	`21`	`PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE`
`22`	`22`	`DESTINATION "bin/"`
	`23`	`+ OPTIONAL`
`23`	`24`	`)`
`24`	`25`
`25`	`26`	`install(`
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ install(`
`42`	`42`	`FILES ${BINARY_FILES}`
`43`	`43`	`PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE`
`44`	`44`	`DESTINATION "bin/"`
	`45`	`+ OPTIONAL`
`45`	`46`	`)`
`46`	`47`
`47`	`48`	`install(`