Skip to content

Commit

Permalink
Fix additional subdirectory issues with wish_create_external
Browse files Browse the repository at this point in the history
  • Loading branch information
VaderDev committed Jan 27, 2024
1 parent 4765274 commit ede3fb5
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ wget https://raw.githubusercontent.com/VaderY/wish/master/cmake/wish.cmake -P cm
Inside your root CMakeLists.txt file just set the version and include the primary script:
TODO: More documentation
```
set(WISH_REQUEST_VERSION v5.5.1)
set(WISH_REQUEST_VERSION v5.5.2)
include(cmake/wish.cmake)
```

Expand All @@ -32,8 +32,10 @@ include(cmake/wish.cmake)
TODO: Format, place
TODO: Auto self update the wish.cmake script (not just the wish/ folder)

- v5.5.2
- Fix: Fix additional subdirectory issues with wish_create_external
- v5.5.1
- Fix: Fix some subdirectory issue with wish_create_ide_target, wish_group and wish_resource_mapping
- Fix: Fix some subdirectory issues with wish_create_ide_target, wish_group and wish_resource_mapping
- v5.5.0
- Improvement: Disable optimization for 'debug' build type and create a new 'optdebug' build type with it
- v5.4.4
Expand Down
2 changes: 1 addition & 1 deletion cmake/wish.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
if (NOT DEFINED WISH_REQUEST_VERSION)
message(FATAL_ERROR "Wish: WISH_REQUEST_VERSION is not defined\n"
" Usage:\n"
" set(WISH_REQUEST_VERSION v5.5.1)\n"
" set(WISH_REQUEST_VERSION v5.5.2)\n"
" include(cmake/wish.cmake)\n")
endif ()

Expand Down
4 changes: 2 additions & 2 deletions cmake/wish/wish_create.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,9 @@ function(wish_create_external)

# link
if(arg_LINK)
link_directories(${PATH_EXT}/${arg_NAME}/lib)
target_link_directories(ext_${arg_NAME} INTERFACE ${PATH_EXT}/${arg_NAME}/lib)
target_link_libraries(ext_${arg_NAME} INTERFACE ${arg_LINK})
endif()
target_link_libraries(ext_${arg_NAME} INTERFACE ${arg_LINK})

set(temp_list ${__wish_external_defines})
foreach(var_define IN LISTS arg_DEFINE)
Expand Down
2 changes: 1 addition & 1 deletion cmake/wish/wish_version.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

include_guard(GLOBAL)

set(wish_version v5.5.1)
set(wish_version v5.5.2)

# Remove the leading 'v' from version. The v is present for convenience with search-and-replace on new release.
string(SUBSTRING "${wish_version}" 1 -1 wish_version)

0 comments on commit ede3fb5

Please sign in to comment.