Skip to content

Commit

Permalink
wxutil library is now buildable with CMake
Browse files Browse the repository at this point in the history
find_package(wxWidgets) is used to locate wxWidgets itself; also added the FTGL
dependency and bumped cmake_minimum_required to 3.12 (for
add_compile_definitions) and C++ version to C++14 (for make_unique).
  • Loading branch information
Matthew Mott committed Dec 3, 2020
1 parent 5df7247 commit 3d9d7eb
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 2 deletions.
12 changes: 10 additions & 2 deletions CMakeLists.txt
@@ -1,10 +1,10 @@
cmake_minimum_required(VERSION 3.10)
cmake_minimum_required(VERSION 3.12)

# Project name and version
project(darkradiant VERSION 2.9.2)

# C++ standard
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED True)

# Build shared libraries by default
Expand All @@ -14,11 +14,19 @@ option(BUILD_SHARED_LIBS "Build shared libraries" ON)
include(FindPkgConfig)
pkg_check_modules(XML libxml-2.0 REQUIRED)
pkg_check_modules(SIGC sigc++-2.0 REQUIRED)
pkg_check_modules(FTGL ftgl REQUIRED)

# Locate wxWidgets
find_package(wxWidgets REQUIRED COMPONENTS base)
message("Using wxWidgets file ${wxWidgets_USE_FILE}")
include(${wxWidgets_USE_FILE})

# Global includes and flags
include_directories(libs libs/libfmt include)
add_compile_definitions(POSIX WXINTL_NO_GETTEXT_MACRO)

# Subdirectories
add_subdirectory(libs/math)
add_subdirectory(libs/xmlutil)
add_subdirectory(libs/scene)
add_subdirectory(libs/wxutil)
22 changes: 22 additions & 0 deletions libs/wxutil/CMakeLists.txt
@@ -0,0 +1,22 @@
add_library(wxutil
ConsoleView.cpp
DirChooser.cpp
EntityClassChooser.cpp
FileChooser.cpp
FreezePointer.cpp
GLFont.cpp
GLWidget.cpp
KeyValueTable.cpp
ModalProgressDialog.cpp
MouseToolHandler.cpp
PanedPosition.cpp
PathEntry.cpp
SerialisableWidgets.cpp
SourceView.cpp
Splitter.cpp
TreeModel.cpp
TreeModelFilter.cpp
TreeView.cpp
VFSTreePopulator.cpp
WindowPosition.cpp)
target_compile_options(wxutil PUBLIC ${SIGC_CFLAGS} ${FTGL_CFLAGS})

0 comments on commit 3d9d7eb

Please sign in to comment.