always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmake: Fix target naming convention

Browse Source
This commit is contained in:
Corentin Le Molgat
2021-10-18 12:57:53 +02:00
parent f15537de74
commit 322a404ec4
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/dotnet.cmake
View File

@@ -261,7 +261,7 @@ function(add_dotnet_test FILE_NAME)
${DOTNET_TEST_PATH}/${TEST_NAME}.csproj
@ONLY)
add_custom_target(dotnet_test_${TEST_NAME} ALL
add_custom_target(dotnet_${COMPONENT_NAME}_${TEST_NAME} ALL
DEPENDS
${DOTNET_TEST_PATH}/${TEST_NAME}.csproj
${DOTNET_TEST_PATH}/${TEST_NAME}.cs
@@ -270,7 +270,7 @@ function(add_dotnet_test FILE_NAME)
${DOTNET_TEST_PATH}/bin
${DOTNET_TEST_PATH}/obj
WORKING_DIRECTORY ${DOTNET_TEST_PATH})
add_dependencies(dotnet_test_${TEST_NAME} dotnet_package)
add_dependencies(dotnet_${COMPONENT_NAME}_${TEST_NAME} dotnet_package)
if(BUILD_TESTING)
add_test(
@@ -368,7 +368,7 @@ function(add_dotnet_example FILE_NAME)
${DOTNET_EXAMPLE_PATH}/${EXAMPLE_NAME}.csproj
@ONLY)
add_custom_target(dotnet_example_${EXAMPLE_NAME} ALL
add_custom_target(dotnet_${COMPONENT_NAME}_${EXAMPLE_NAME} ALL
DEPENDS
${DOTNET_EXAMPLE_PATH}/${EXAMPLE_NAME}.csproj
${DOTNET_EXAMPLE_PATH}/${EXAMPLE_NAME}.cs
@@ -378,7 +378,7 @@ function(add_dotnet_example FILE_NAME)
${DOTNET_EXAMPLE_PATH}/bin
${DOTNET_EXAMPLE_PATH}/obj
WORKING_DIRECTORY ${DOTNET_EXAMPLE_PATH})
add_dependencies(dotnet_example_${EXAMPLE_NAME} dotnet_package)
add_dependencies(dotnet_${COMPONENT_NAME}_${EXAMPLE_NAME} dotnet_package)
if(BUILD_TESTING)
add_test(

12
cmake/java.cmake
View File

@@ -213,13 +213,13 @@ if(BUILD_TESTING)
${TEST_PATH}/pom.xml
@ONLY)
add_custom_target(java_test_Test ALL
add_custom_target(java_tests_Test ALL
DEPENDS ${TEST_PATH}/pom.xml
COMMAND ${MAVEN_EXECUTABLE} compile -B
BYPRODUCTS
${TEST_PATH}/target
WORKING_DIRECTORY ${TEST_PATH})
add_dependencies(java_test_Test java_package)
add_dependencies(java_tests_Test java_package)
add_test(
NAME java_tests_Test
@@ -314,7 +314,7 @@ function(add_java_example FILE_NAME)
${EXAMPLE_PATH}/pom.xml
@ONLY)
add_custom_target(java_example_${EXAMPLE_NAME} ALL
add_custom_target(java_${COMPONENT_NAME}_${EXAMPLE_NAME} ALL
DEPENDS
${EXAMPLE_PATH}/pom.xml
${EXAMPLE_PATH}/${JAVA_PACKAGE_PATH}/${EXAMPLE_NAME}.java
@@ -322,7 +322,7 @@ function(add_java_example FILE_NAME)
BYPRODUCTS
${EXAMPLE_PATH}/target
WORKING_DIRECTORY ${EXAMPLE_PATH})
add_dependencies(java_example_${EXAMPLE_NAME} java_package)
add_dependencies(java_${COMPONENT_NAME}_${EXAMPLE_NAME} java_package)
if(BUILD_TESTING)
add_test(
@@ -364,7 +364,7 @@ function(add_java_test FILE_NAME)
${TEST_PATH}/pom.xml
@ONLY)
add_custom_target(java_test_${TEST_NAME} ALL
add_custom_target(java_${COMPONENT_NAME}_${TEST_NAME} ALL
DEPENDS
${TEST_PATH}/pom.xml
${TEST_PATH}/${JAVA_TEST_PATH}/${TEST_NAME}.java
@@ -372,7 +372,7 @@ function(add_java_test FILE_NAME)
BYPRODUCTS
${TEST_PATH}/target
WORKING_DIRECTORY ${TEST_PATH})
add_dependencies(java_test_${TEST_NAME} java_package)
add_dependencies(java_${COMPONENT_NAME}_${TEST_NAME} java_package)
if(BUILD_TESTING)
add_test(