diff options
| author | Dave Blake <oak99sky@yahoo.co.uk> | 2018-11-17 22:54:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-17 22:54:10 +0000 |
| commit | f01060fc8cd949427166495f6b20d2deae0f97b6 (patch) | |
| tree | 8cba5d6976a021d0b9c1ac1c81ff5729e4b659dc /cmake | |
| parent | 8b68a90123900c4e11e848144a26ca4e99ca3e55 (diff) | |
| parent | 9856a219959c7b15fda684de1103775a19834795 (diff) | |
Merge pull request #14899 from Rechi/fix/jsonSchemaBuilder
[fix] remove outdated JsonSchemaBuilder executable after #14774
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindJsonSchemaBuilder.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmake/modules/FindJsonSchemaBuilder.cmake b/cmake/modules/FindJsonSchemaBuilder.cmake index 352cb0dea6..094c2faaf8 100644 --- a/cmake/modules/FindJsonSchemaBuilder.cmake +++ b/cmake/modules/FindJsonSchemaBuilder.cmake @@ -16,7 +16,7 @@ if(NOT TARGET JsonSchemaBuilder::JsonSchemaBuilder) add_executable(JsonSchemaBuilder::JsonSchemaBuilder IMPORTED GLOBAL) set_target_properties(JsonSchemaBuilder::JsonSchemaBuilder PROPERTIES IMPORTED_LOCATION "${NATIVEPREFIX}/bin/JsonSchemaBuilder") - elseif(CORE_SYSTEM_NAME STREQUAL windows OR CORE_SYSTEM_NAME STREQUAL windowsstore) + elseif(CORE_SYSTEM_NAME STREQUAL windowsstore) add_executable(JsonSchemaBuilder::JsonSchemaBuilder IMPORTED GLOBAL) set_target_properties(JsonSchemaBuilder::JsonSchemaBuilder PROPERTIES IMPORTED_LOCATION "${DEPENDENCIES_DIR}/bin/json-rpc/JsonSchemaBuilder") @@ -36,6 +36,7 @@ if(NOT TARGET JsonSchemaBuilder::JsonSchemaBuilder) else() add_subdirectory(${CMAKE_SOURCE_DIR}/tools/depends/native/JsonSchemaBuilder build/jsonschemabuilder) add_executable(JsonSchemaBuilder::JsonSchemaBuilder ALIAS JsonSchemaBuilder) + set_target_properties(JsonSchemaBuilder PROPERTIES FOLDER Tools) endif() endif() endif() |