Build with system wx workaround: https://github.com/aardappel/treesheets/issues/1083 --- CMakeLists.txt.orig 2025-09-20 08:01:27 UTC +++ CMakeLists.txt @@ -7,7 +7,7 @@ endif() set(TREESHEETS_VERSION "${timestamp}") endif() -project(TreeSheets +project(treesheets DESCRIPTION "A free-form hierarchical data organizer" HOMEPAGE_URL "https://github.com/aardappel/treesheets" VERSION "${TREESHEETS_VERSION}") @@ -32,17 +32,11 @@ FetchContent_Declare( include(FetchContent) FetchContent_Declare( - wxwidgets - GIT_REPOSITORY https://github.com/wxWidgets/wxWidgets - GIT_TAG v3.2.8 - FIND_PACKAGE_ARGS 3.2.8 NAMES wxWidgets -) -FetchContent_Declare( lobster GIT_REPOSITORY https://github.com/aardappel/lobster GIT_TAG v2025.3 ) -FetchContent_MakeAvailable(wxwidgets lobster) +FetchContent_MakeAvailable(lobster) ### Options @@ -143,7 +137,12 @@ target_precompile_headers(TreeSheets PUBLIC src/stdafx target_precompile_headers(TreeSheets PUBLIC src/stdafx.h) ## Link wxWidgets, lobster-impl and StackWalker into TreeSheets -set(TREESHEETS_LIBS wx::aui wx::adv wx::core wx::xml wx::net lobster-impl) +find_package(wxWidgets REQUIRED COMPONENTS aui adv core xml net) +set(TREESHEETS_LIBS ${wxWidgets_LIBRARIES} lobster-impl) +target_link_libraries(TreeSheets PRIVATE ${TREESHEETS_LIBS}) +target_include_directories(TreeSheets PRIVATE ${wxWidgets_INCLUDE_DIRS}) +target_compile_definitions(TreeSheets PRIVATE ${wxWidgets_DEFINITIONS}) +# https://github.com/aardappel/treesheets/issues/1083 if(WIN32) list(APPEND TREESHEETS_LIBS StackWalker) endif() @@ -193,7 +192,7 @@ install(FILES ${treesheets_readme_files} DESTINATION $ install(DIRECTORY TS/docs DESTINATION ${TREESHEETS_DOCDIR}) file(GLOB treesheets_readme_files "TS/readme*.html") install(FILES ${treesheets_readme_files} DESTINATION ${TREESHEETS_DOCDIR}) -install(DIRECTORY TS/examples DESTINATION ${TREESHEETS_DOCDIR}) +install(DIRECTORY TS/examples DESTINATION ${CMAKE_INSTALL_DATADIR}/examples/${CMAKE_PROJECT_NAME}) install(DIRECTORY TS/images DESTINATION ${TREESHEETS_PKGDATADIR}) install(DIRECTORY TS/scripts DESTINATION ${TREESHEETS_PKGDATADIR})