Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Windows build instructions #46

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ PROJECT(Wisteria)

# Build the documentation (not available on Windows)
########################
IF(NOT WIN32)
#IF(NOT WIN32)
# https://vicrucann.github.io/tutorials/quick-cmake-doxygen/
FIND_PACKAGE(Doxygen)
IF(DOXYGEN_FOUND)
Expand All @@ -55,7 +55,7 @@ IF(NOT WIN32)
ELSE(DOXYGEN_FOUND)
MESSAGE("Doxygen not found. API documentation will not be generated.")
ENDIF()
ENDIF()
#ENDIF()

# Setup wxWidgets
########################
Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -151,14 +151,14 @@ git clone https://github.com/wxWidgets/wxWidgets.git --recurse-submodules

Refer [here](https://github.com/wxWidgets/wxWidgets/blob/master/README-GIT.md) for how to build wxWidgets.

Next, build Wisteria:

If using CMake GUI, open "CMakeLists.txt" and set `wxWidgets_ROOT_DIR` to the
root folder of wxWidgets. Next, configure and generate a project file for your compiler.

If using Visual Studio, open the Wisteria folder to load the project.
Then go to `Project -> CMake Settings for Wisteria...`. Add an entry for `wxWidgets_ROOT_DIR`
and specify the path to your wxWidgets folder. Save and then build the project.
Next, build Wisteria using CMake GUI:
- open "CMakeLists.txt" (point CMake GUI at Wisteria directory and this happens automatically)
- set `wxWidgets_ROOT_DIR` to the root folder of wxWidgets.
- set `wxWidgets_wxrc_EXECUTABLE` (ie `E:/wxWidgets-3.2.5/utils/wxrc/vc_x64_mswud/wxrc.exe`)
- configure and generate a project file for your compiler.

Don't try to use Visual Studio CMake; as of July-2024 Visual Studio 2022 it no longer works with Wisteria...
However, Wisteria builds and runs just fine with the above CMake-GUI-generated Visual Studio solution.

Linux
-----------------------------
Expand Down
2 changes: 1 addition & 1 deletion src/base/axis.h
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ namespace Wisteria::GraphItems
};

/// @brief An axis on a graph.
/// @sa The [axis](../../Axes.md) overview for more information.
/// @sa The [axis](../../../Axes.md) overview for more information.
class Axis final : public GraphItems::GraphItemBase
{
friend class Wisteria::Canvas;
Expand Down
2 changes: 1 addition & 1 deletion src/base/canvas.h
Original file line number Diff line number Diff line change
Expand Up @@ -567,7 +567,7 @@ namespace Wisteria

/** @name Print Functions
@brief Functions related to printing and printer settings.
@sa The [printing](../../Printing.md) overview for more information.*/
@sa The [printing](../../../Printing.md) overview for more information.*/
/// @{

/** @brief Sets the printer data, which includes paper size, orientation, etc.
Expand Down
2 changes: 1 addition & 1 deletion src/base/colorbrewer.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include <wx/wx.h>

/// @brief Color management features (building, brewing, contrasting, etc.).
/// @sa The [color management](../../Colors.md) overview for more information.
/// @sa The [color management](../../../Colors.md) overview for more information.
namespace Wisteria::Colors
{
/** @brief Constructs a color scale for a given range of values.
Expand Down
2 changes: 1 addition & 1 deletion src/data/dataset.h
Original file line number Diff line number Diff line change
Expand Up @@ -970,7 +970,7 @@ namespace Wisteria::Data
@details Contains columns for continuous data, categoricals, groupings,
dates, and observation names/IDs.

@sa [Importing Data](../../ImportingData.md) and [Building Data](../../BuildingData.md)
@sa [Importing Data](../../../ImportingData.md) and [Building Data](../../../BuildingData.md)
for dataset overviews.*/
class Dataset
{
Expand Down