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.

Sign up for GitHub

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

Fix QScintilla2 CMake Issues #97

Merged
merged 8 commits into from
Mar 9, 2020
Merged

Fix QScintilla2 CMake Issues #97

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
04b7e15
Update CMakeLists.txt
RobertBColton Mar 9, 2020
c630033
Remove duplicate CodeWidgetPlain.cpp inclusion
RobertBColton Mar 9, 2020
1dc6c7f
try public idk
RobertBColton Mar 9, 2020
cfcdb2d
public no werk idk try include dir for moc mebe
RobertBColton Mar 9, 2020
0ffc8d1
cleanup and fix typo
RobertBColton Mar 9, 2020
66f23a6
qsci message should be status and idk try -DQSCINTILLA_DLL
RobertBColton Mar 9, 2020
3223b8f
oopsy
RobertBColton Mar 9, 2020
a1543b3
Merge branch 'master' of https://github.com/enigma-dev/RadialGM into …
RobertBColton Mar 9, 2020
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
5 changes: 3 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ set(RGM_SOURCES
Editors/SpriteEditor.cpp
Editors/BaseEditor.cpp
Editors/RoomEditor.cpp
Widgets/CodeWidgetPlain.cpp
Widgets/AssetView.cpp
Widgets/CodeWidget.cpp
Widgets/BackgroundView.cpp
Expand Down Expand Up @@ -153,7 +152,7 @@ set(RGM_RC
)

# Check for QScintilla
find_library(LIB_QSCINTILLA NAMES qscintilla2)
find_library(LIB_QSCINTILLA NAMES qscintilla2 qscintilla2_qt5 qscintilla2-qt5 qt5scintilla2 libqscintilla2_qt5.so libqscintilla2.so libqscintilla2.a qscintilla2.lib)
if (NOT LIB_QSCINTILLA)
set(EDITOR_SOURCES Widgets/CodeWidgetPlain.cpp)
else()
Expand Down Expand Up @@ -197,6 +196,8 @@ foreach(CompilerFlag ${CompilerFlags})
endforeach()

if (LIB_QSCINTILLA)
message(STATUS "Found QScintilla: ${LIB_QSCINTILLA}")
add_definitions(-DQSCINTILLA_DLL)
target_link_libraries(${EXE} PRIVATE ${LIB_QSCINTILLA})
endif()

Expand Down