Merge d1633bb into ddbf00b

opencor · Jul 4, 2018 · 7b385e3 · 7b385e3
2 parents ddbf00b + d1633bb
commit 7b385e3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -808,7 +808,9 @@ endif()
 
 # Specify a target to build our non-library packages (e.g. Python)
 
-add_custom_target(OpenCORBuild ALL)
+set(PROJECT_BUILD ${PROJECT_NAME}Build)
+
+add_custom_target(${PROJECT_BUILD} 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(OpenCORBuild ${PROJECT_NAME})
+add_dependencies(${PROJECT_BUILD} ${PROJECT_NAME})
 
 if(NOT "${DEPENDS_ON}" STREQUAL "")
     add_dependencies(${PROJECT_NAME} ${DEPENDS_ON})
@@ -552,7 +552,7 @@ file(COPY ${PROJECT_SOURCE_DIR}/scripts/set_python_path.py
 
 # And run it
 
-add_custom_command(TARGET PythonPlugin POST_BUILD
+add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
                    COMMAND ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR}/${PYTHON_EXECUTABLE}
                            ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR}/${SCRIPT_DIR}/set_python_path.py
                            ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} -s)
diff --git a/src/plugins/thirdParty/PythonPackages/CMakeLists.txt b/src/plugins/thirdParty/PythonPackages/CMakeLists.txt
@@ -153,15 +153,15 @@ set(SPHINX_BUILD_EXECUTABLE
 
 add_custom_target(${PROJECT_NAME})
 
-add_dependencies(OpenCORBuild ${PROJECT_NAME})
+add_dependencies(${PROJECT_BUILD} ${PROJECT_NAME})
 
 if(NOT "${DEPENDS_ON}" STREQUAL "")
     add_dependencies(${PROJECT_NAME} ${DEPENDS_ON})
 endif()
 
 # Update the Python path in newly copied scripts
 
-add_custom_command(TARGET PythonPackagesPlugin POST_BUILD
+add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
                    COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_SCRIPT_DIR}/set_python_path.py
                                                 --update-path ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR}/${PYTHON_RELATIVE_SCRIPT_DIR}
                                                 ${PYTHON_ROOT_DIR} -s)