diff options
| -rw-r--r-- | CMakeLists.txt | 23 | ||||
| -rw-r--r-- | examples/network/Makefile | 4 |
2 files changed, 17 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 041553fd0..2591fccbf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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)" ON) +OPTION (BUILD_SHARED_LIBS "Build Shared Library (OFF for Static)" OFF) 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) diff --git a/examples/network/Makefile b/examples/network/Makefile index 0cffe855b..708a6b1b3 100644 --- a/examples/network/Makefile +++ b/examples/network/Makefile @@ -1,9 +1,9 @@ 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 \ |