Commit 41cbbea8 by Chris Young

Let platform 'Generic' get the regex deps so we don't need to use our external ones

parent 5c0fd7b9
...@@ -41,6 +41,10 @@ ENDIF() ...@@ -41,6 +41,10 @@ ENDIF()
IF (NOT WIN32) IF (NOT WIN32)
FIND_PACKAGE(ZLIB) FIND_PACKAGE(ZLIB)
IF (CMAKE_SYSTEM_NAME MATCHES "Generic")
INCLUDE_DIRECTORIES(deps/regex)
SET(SRC_REGEX deps/regex/regex.c)
ENDIF()
ELSE() ELSE()
# Windows doesn't understand POSIX regex on its own # Windows doesn't understand POSIX regex on its own
INCLUDE_DIRECTORIES(deps/regex) INCLUDE_DIRECTORIES(deps/regex)
...@@ -54,7 +58,7 @@ ELSE (ZLIB_FOUND) ...@@ -54,7 +58,7 @@ ELSE (ZLIB_FOUND)
INCLUDE_DIRECTORIES(deps/zlib) INCLUDE_DIRECTORIES(deps/zlib)
ADD_DEFINITIONS(-DNO_VIZ -DSTDC -DNO_GZIP) ADD_DEFINITIONS(-DNO_VIZ -DSTDC -DNO_GZIP)
FILE(GLOB SRC_ZLIB deps/zlib/*.c) FILE(GLOB SRC_ZLIB deps/zlib/*.c)
ENDIF() #ENDIF()
# Installation paths # Installation paths
SET(INSTALL_BIN bin CACHE PATH "Where to install binaries to.") 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.") ...@@ -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.") SET(INSTALL_INC include CACHE PATH "Where to install headers to.")
# Build options # 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 (THREADSAFE "Build libgit2 as threadsafe" OFF)
OPTION (BUILD_CLAR "Build Tests using the Clar suite" ON) OPTION (BUILD_CLAR "Build Tests using the Clar suite" ON)
OPTION (BUILD_EXAMPLES "Build library usage example apps" OFF) OPTION (BUILD_EXAMPLES "Build library usage example apps" OFF)
...@@ -102,12 +106,15 @@ IF (NOT CMAKE_BUILD_TYPE) ...@@ -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) SET(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel." FORCE)
ENDIF () ENDIF ()
#FIND_PACKAGE(OpenSSL) IF (CMAKE_SYSTEM_NAME MATCHES "Generic")
#IF (OPENSSL_FOUND) ELSE ()
# ADD_DEFINITIONS(-DGIT_SSL) FIND_PACKAGE(OpenSSL)
# INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR}) IF (OPENSSL_FOUND)
# SET(SSL_LIBRARIES ${OPENSSL_LIBRARIES}) ADD_DEFINITIONS(-DGIT_SSL)
#ENDIF() INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR})
SET(SSL_LIBRARIES ${OPENSSL_LIBRARIES})
ENDIF()
ENDIF()
IF (THREADSAFE) IF (THREADSAFE)
IF (NOT WIN32) IF (NOT WIN32)
......
default: all default: all
CC = ppc-amigaos-gcc CC = gcc
CFLAGS += -g CFLAGS += -g
CFLAGS += -I../../include -L../../build CFLAGS += -I../../include -L../../build
LIBS += -lgit2 -lpthread -lregex LIBS += -lgit2 -lpthread #-lregex
OBJECTS = \ OBJECTS = \
git2.o \ git2.o \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment