Skip to content

Commit

Permalink
Merge pull request #6 from janekjan/master
Browse files Browse the repository at this point in the history
Update CMake to work outside CLion (Lovely first pull request!)
  • Loading branch information
Etua authored Jan 31, 2020
2 parents 07c7a31 + fbd0e0e commit 6452be3
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ project(Sagger LANGUAGES C VERSION 0.1)
set(CMAKE_C_STANDARD 11)

FIND_PACKAGE(PkgConfig REQUIRED)
PKG_CHECK_MODULES(GTK REQUIRED gtk+-3.0)
PKG_CHECK_MODULES(GTK3 REQUIRED gtk+-3.0)

INCLUDE_DIRECTORIES(${GTK_INCLUDE_DIRS})
LINK_DIRECTORIES(${GTK_LIBRARY_DIRS})
ADD_DEFINITIONS(${GTK_CFLAGS_OTHER})
INCLUDE_DIRECTORIES(${GTK3_INCLUDE_DIRS})
LINK_DIRECTORIES(${GTK3_LIBRARY_DIRS})
ADD_DEFINITIONS(${GTK3_CFLAGS_OTHER})

PKG_CHECK_MODULES(JSON REQUIRED json-glib-1.0)
INCLUDE_DIRECTORIES(${JSON_INCLUDE_DIRS})
Expand All @@ -17,4 +17,4 @@ FIND_PACKAGE(CURL REQUIRED)
INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS})

ADD_EXECUTABLE(Sagger main.c fpcalc.c fpcalc.h run.c run.h structures.h json.c json.h gtk.c gtk.h cli.c cli.h)
TARGET_LINK_LIBRARIES(Sagger ${GTK3_LIBRARIES} ${JSON_LIBRARIES} ${CURL_LIBRARIES})
TARGET_LINK_LIBRARIES(Sagger ${GTK3_LIBRARIES} ${JSON_LIBRARIES} ${CURL_LIBRARIES})

0 comments on commit 6452be3

Please sign in to comment.