54 lines
2.0 KiB
Plaintext
54 lines
2.0 KiB
Plaintext
Build with system wx workaround:
|
|
https://github.com/aardappel/treesheets/issues/1083
|
|
|
|
--- CMakeLists.txt.orig 2026-03-22 09:59:32 UTC
|
|
+++ CMakeLists.txt
|
|
@@ -11,7 +11,7 @@ endif()
|
|
message(STATUS "User-defined version: ${TREESHEETS_VERSION}")
|
|
endif()
|
|
|
|
-project(TreeSheets
|
|
+project(treesheets
|
|
DESCRIPTION "A free-form hierarchical data organizer"
|
|
HOMEPAGE_URL "https://github.com/aardappel/treesheets"
|
|
VERSION "${TREESHEETS_VERSION}")
|
|
@@ -41,15 +41,6 @@ include(FetchContent)
|
|
|
|
include(FetchContent)
|
|
|
|
-FetchContent_Declare(
|
|
- wxwidgets
|
|
- GIT_REPOSITORY https://github.com/wxWidgets/wxWidgets
|
|
- GIT_TAG v3.2.10
|
|
- GIT_SHALLOW ON
|
|
- FIND_PACKAGE_ARGS 3.2.10 NAMES wxWidgets
|
|
-)
|
|
-FetchContent_MakeAvailable(wxwidgets)
|
|
-
|
|
if(ENABLE_LOBSTER)
|
|
FetchContent_Declare(
|
|
lobster
|
|
@@ -137,7 +128,12 @@ endif(ENABLE_LOBSTER)
|
|
if(ENABLE_LOBSTER)
|
|
target_link_libraries(TreeSheets PRIVATE lobster-impl)
|
|
endif(ENABLE_LOBSTER)
|
|
-target_link_libraries(TreeSheets PRIVATE wx::aui wx::adv wx::core wx::xml wx::net)
|
|
+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
|
|
|
|
### Installation
|
|
|
|
@@ -192,7 +188,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})
|