Merge 0ad7a2d into 3b5d83a

opencor · Jul 5, 2018 · 21afbaa · 21afbaa
2 parents 3b5d83a + 0ad7a2d
commit 21afbaa
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -806,11 +806,11 @@ if(ENABLE_TESTS)
     endif()
 endif()
 
-# Specify a target to build our non-library packages (e.g. Python)
+# Specify a target to help us build certain plugins (e.g. the Python plugin)
 
-set(PROJECT_BUILD ${PROJECT_NAME}Build)
+set(PROJECT_BUILD_TARGET ${PROJECT_NAME}Build)
 
-add_custom_target(${PROJECT_BUILD} ALL)
+add_custom_target(${PROJECT_BUILD_TARGET} ALL)
 
 # Build our plugins
 # Note #1: hard dependencies (i.e. OpenSSL and zlib) must be listed before any

diff --git a/src/plugins/thirdParty/Python/CMakeLists.txt b/src/plugins/thirdParty/Python/CMakeLists.txt
@@ -539,7 +539,7 @@ set(PYTHON_FULL_VERSION ${MAJOR_MINOR_LIBRARY_VERSION}${PYTHON_ABIFLAGS} PARENT_
 
 add_custom_target(${PROJECT_NAME})
 
-add_dependencies(${PROJECT_BUILD} ${PROJECT_NAME})
+add_dependencies(${PROJECT_BUILD_TARGET} ${PROJECT_NAME})
 
 if(NOT "${DEPENDS_ON}" STREQUAL "")
     add_dependencies(${PROJECT_NAME} ${DEPENDS_ON})

diff --git a/src/plugins/thirdParty/PythonPackages/CMakeLists.txt b/src/plugins/thirdParty/PythonPackages/CMakeLists.txt
@@ -153,7 +153,7 @@ set(SPHINX_BUILD_EXECUTABLE
 
 add_custom_target(${PROJECT_NAME})
 
-add_dependencies(${PROJECT_BUILD} ${PROJECT_NAME})
+add_dependencies(${PROJECT_BUILD_TARGET} ${PROJECT_NAME})
 
 if(NOT "${DEPENDS_ON}" STREQUAL "")
     add_dependencies(${PROJECT_NAME} ${DEPENDS_ON})