Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
git2
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lvzhengyang
git2
Commits
41cbbea8
Commit
41cbbea8
authored
Jun 09, 2012
by
Chris Young
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Let platform 'Generic' get the regex deps so we don't need to use our external ones
parent
5c0fd7b9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
10 deletions
+17
-10
CMakeLists.txt
+15
-8
examples/network/Makefile
+2
-2
No files found.
CMakeLists.txt
View file @
41cbbea8
...
...
@@ -41,6 +41,10 @@ ENDIF()
IF
(
NOT WIN32
)
FIND_PACKAGE
(
ZLIB
)
IF
(
CMAKE_SYSTEM_NAME MATCHES
"Generic"
)
INCLUDE_DIRECTORIES
(
deps/regex
)
SET
(
SRC_REGEX deps/regex/regex.c
)
ENDIF
()
ELSE
()
# Windows doesn't understand POSIX regex on its own
INCLUDE_DIRECTORIES
(
deps/regex
)
...
...
@@ -54,7 +58,7 @@ ELSE (ZLIB_FOUND)
INCLUDE_DIRECTORIES
(
deps/zlib
)
ADD_DEFINITIONS
(
-DNO_VIZ -DSTDC -DNO_GZIP
)
FILE
(
GLOB SRC_ZLIB deps/zlib/*.c
)
ENDIF
()
#
ENDIF()
# Installation paths
SET
(
INSTALL_BIN bin CACHE PATH
"Where to install binaries to."
)
...
...
@@ -62,7 +66,7 @@ SET(INSTALL_LIB lib CACHE PATH "Where to install libraries to.")
SET
(
INSTALL_INC include CACHE PATH
"Where to install headers to."
)
# Build options
OPTION
(
BUILD_SHARED_LIBS
"Build Shared Library (OFF for Static)"
O
N
)
OPTION
(
BUILD_SHARED_LIBS
"Build Shared Library (OFF for Static)"
O
FF
)
OPTION
(
THREADSAFE
"Build libgit2 as threadsafe"
OFF
)
OPTION
(
BUILD_CLAR
"Build Tests using the Clar suite"
ON
)
OPTION
(
BUILD_EXAMPLES
"Build library usage example apps"
OFF
)
...
...
@@ -102,12 +106,15 @@ IF (NOT CMAKE_BUILD_TYPE)
SET
(
CMAKE_BUILD_TYPE
"Debug"
CACHE STRING
"Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel."
FORCE
)
ENDIF
()
#FIND_PACKAGE(OpenSSL)
#IF (OPENSSL_FOUND)
# ADD_DEFINITIONS(-DGIT_SSL)
# INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR})
# SET(SSL_LIBRARIES ${OPENSSL_LIBRARIES})
#ENDIF()
IF
(
CMAKE_SYSTEM_NAME MATCHES
"Generic"
)
ELSE
()
FIND_PACKAGE
(
OpenSSL
)
IF
(
OPENSSL_FOUND
)
ADD_DEFINITIONS
(
-DGIT_SSL
)
INCLUDE_DIRECTORIES
(
${
OPENSSL_INCLUDE_DIR
}
)
SET
(
SSL_LIBRARIES
${
OPENSSL_LIBRARIES
}
)
ENDIF
()
ENDIF
()
IF
(
THREADSAFE
)
IF
(
NOT WIN32
)
...
...
examples/network/Makefile
View file @
41cbbea8
default
:
all
CC
=
ppc-amigaos-
gcc
CC
=
gcc
CFLAGS
+=
-g
CFLAGS
+=
-I
../../include
-L
../../build
LIBS
+=
-lgit2
-lpthread
-lregex
LIBS
+=
-lgit2
-lpthread
#
-lregex
OBJECTS
=
\
git2.o
\
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment