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

Use discount installed on the system #100

Open
wants to merge 1 commit into
base: master
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
28 changes: 1 addition & 27 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,6 @@ project(MarkMyWords)

cmake_minimum_required(VERSION 2.6)

# build the markdown lib
include(ExternalProject)
set(DISCOUNT_DEP_PATH ${CMAKE_SOURCE_DIR}/deps/discount)
set(DISCOUNT_LIB_PATH ${CMAKE_BINARY_DIR}/libmarkdown.a)
set(DISCOUNT_INCLUDE_PATH ${DISCOUNT_DEP_PATH})

ExternalProject_Add(discount
PREFIX ${DISCOUNT_DEP_PATH}
SOURCE_DIR ${DISCOUNT_DEP_PATH}
CONFIGURE_COMMAND
${DISCOUNT_DEP_PATH}/configure.sh --src=${DISCOUNT_DEP_PATH}
--prefix=${CMAKE_BINARY_DIR}
--libdir=${CMAKE_BINARY_DIR}
--with-fenced-code
BUILD_COMMAND make install
BUILD_IN_SOURCE 1
)

include_directories(${DISCOUNT_INCLUDE_PATH})

# build UI lib
list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)

Expand All @@ -39,6 +19,7 @@ pkg_check_modules(DEPS REQUIRED
gtksourceview-3.0>=3.10
gthread-2.0
gtk+-3.0>=3.9.10
libmarkdown
)

add_definitions(${DEPS_CFLAGS})
Expand Down Expand Up @@ -115,13 +96,6 @@ OPTIONS

add_executable(mark-my-words ${VALA_C} ${generated_resources})

target_link_libraries(mark-my-words
${DISCOUNT_LIB_PATH})

add_dependencies(mark-my-words
discount
)

install(TARGETS mark-my-words RUNTIME
DESTINATION bin)

Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ Author: Akshay Shekher
```shell
sudo apt-get install libwebkit2gtk-3.0-dev
sudo apt-get install libgtksourceview-3.0-dev
sudo apt-get install libmarkdown2-dev
sudo apt-get install valac
git clone https://github.com/voldyman/MarkMyWords.git
cd MarkMyWords
Expand Down
30 changes: 0 additions & 30 deletions deps/discount/COPYRIGHT

This file was deleted.

35 changes: 0 additions & 35 deletions deps/discount/CREDITS

This file was deleted.

61 changes: 0 additions & 61 deletions deps/discount/Csio.c

This file was deleted.

41 changes: 0 additions & 41 deletions deps/discount/INSTALL

This file was deleted.

141 changes: 0 additions & 141 deletions deps/discount/Makefile.in

This file was deleted.

Loading