Page MenuHomeFreeBSD
Differential D13831 Diff 37751 databases/arangodb33/files/patch-CMakeLists.txt

Changeset View

Standalone View

View Options

databases/arangodb33/files/patch-CMakeLists.txt

--- CMakeLists.txt.orig 2017-11-15 11:23:07 UTC --- CMakeLists.txt.orig 2018-01-05 13:56:52 UTC
+++ CMakeLists.txt +++ CMakeLists.txt
@@ -38,9 +38,9 @@ if (NOT CMAKE_OSX_DEPLOYMENT_TARGET) @@ -38,9 +38,9 @@ if (NOT CMAKE_OSX_DEPLOYMENT_TARGET)
endif () endif ()
if (WIN32) if (WIN32)
- project(arangodb3 CXX C) - project(arangodb3 CXX C)
+ project(arangodb CXX C) + project(arangodb CXX C)
else () else ()
- project(arangodb3 CXX C ASM) - project(arangodb3 CXX C ASM)
+ project(arangodb CXX C ASM) + project(arangodb CXX C ASM)
endif () endif ()
# required for clang completion in editors # required for clang completion in editors
@@ -364,7 +364,7 @@ if (CMAKE_COMPILER_IS_GNUCC OR APPLE) @@ -370,7 +370,7 @@ if (CMAKE_COMPILER_IS_GNUCC OR APPLE)
endif () endif ()
if (CMAKE_COMPILER_IS_CLANG) if (CMAKE_COMPILER_IS_CLANG)
- if (APPLE) - if (APPLE)
+ if (APPLE OR FREEBSD) + if (APPLE OR FREEBSD)
set(BASE_CXX_FLAGS "${BASE_CXX_FLAGS} -stdlib=libc++") set(BASE_CXX_FLAGS "${BASE_CXX_FLAGS} -stdlib=libc++")
add_definitions("-Wno-deprecated-declarations") add_definitions("-Wno-deprecated-declarations")
else () else ()
@@ -498,7 +498,11 @@ if (USE_BACKTRACE) @@ -505,7 +505,11 @@ if (USE_BACKTRACE)
if (MSVC) if (MSVC)
set(BT_LIBS "Dbghelp" CACHE path "Debug Helper libraries") set(BT_LIBS "Dbghelp" CACHE path "Debug Helper libraries")
else () else ()
- set(BT_LIBS "" CACHE path "Debug Helper libraries") - set(BT_LIBS "" CACHE path "Debug Helper libraries")
+ if (FREEBSD) + if (FREEBSD)
+ set(BT_LIBS execinfo) + set(BT_LIBS execinfo)
+ else () + else ()
+ set(BT_LIBS "" CACHE path "Debug Helper libraries") + set(BT_LIBS "" CACHE path "Debug Helper libraries")
+ endif () + endif ()
endif () endif ()
add_definitions("-DARANGODB_ENABLE_BACKTRACE=1") add_definitions("-DARANGODB_ENABLE_BACKTRACE=1")
@@ -573,7 +577,9 @@ endif () @@ -580,7 +584,9 @@ endif ()
################################################################################ ################################################################################
if (NOT WINDOWS) if (NOT WINDOWS)
- set(SYS_LIBS ${SYS_LIBS} resolv) - set(SYS_LIBS ${SYS_LIBS} resolv)
+ if (NOT FREEBSD) + if (NOT FREEBSD)
+ set(SYS_LIBS ${SYS_LIBS} resolv) + set(SYS_LIBS ${SYS_LIBS} resolv)
+ endif () + endif ()
if (NOT DARWIN) if (NOT DARWIN)
set(SYS_LIBS ${SYS_LIBS} rt) set(SYS_LIBS ${SYS_LIBS} rt)
@@ -651,17 +657,17 @@ if (CMAKE_COMPILER_IS_GNUCC)
set(BASE_FLAGS "-Wall -Wextra -Wno-unused-parameter ${BASE_FLAGS}")
- set(CMAKE_C_FLAGS "-g" CACHE INTERNAL "default C compiler flags")
- set(CMAKE_C_FLAGS_DEBUG "-O0 -g -D_DEBUG=1" CACHE INTERNAL "C debug flags")
- set(CMAKE_C_FLAGS_MINSIZEREL "-Os" CACHE INTERNAL "C minimal size flags")
- set(CMAKE_C_FLAGS_RELEASE "-O3 -fomit-frame-pointer" CACHE INTERNAL "C release flags")
- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -g -fno-omit-frame-pointer" CACHE INTERNAL "C release with debug info flags")
+ #set(CMAKE_C_FLAGS "-g" CACHE INTERNAL "default C compiler flags")
+ set(CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS} CACHE INTERNAL "C debug flags")
+ set(CMAKE_C_FLAGS_MINSIZEREL ${CMAKE_C_FLAGS} CACHE INTERNAL "C minimal size flags")
+ set(CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS} CACHE INTERNAL "C release flags")
+ set(CMAKE_C_FLAGS_RELWITHDEBINFO ${CMAKE_C_FLAGS} CACHE INTERNAL "C release with debug info flags")
- set(CMAKE_CXX_FLAGS "-g -Wnon-virtual-dtor" CACHE INTERNAL "default C++ compiler flags")
- set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -D_DEBUG=1" CACHE INTERNAL "C++ debug flags")
- set(CMAKE_CXX_FLAGS_MINSIZEREL "-Os" CACHE INTERNAL "C++ minimal size flags")
- set(CMAKE_CXX_FLAGS_RELEASE "-O3 -fomit-frame-pointer" CACHE INTERNAL "C++ release flags")
- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -g -fno-omit-frame-pointer" CACHE INTERNAL "C++ release with debug info flags")
+ #set(CMAKE_CXX_FLAGS "-g -Wnon-virtual-dtor" CACHE INTERNAL "default C++ compiler flags")
+ set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -D_DEBUG=1" CACHE INTERNAL "C++ debug flags")
+ set(CMAKE_CXX_FLAGS_MINSIZEREL ${CMAKE_CXX_FLAGS} CACHE INTERNAL "C++ minimal size flags")
+ set(CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS} CACHE INTERNAL "C++ release flags")
+ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS} CACHE INTERNAL "C++ release with debug info flags")
elseif (CMAKE_COMPILER_IS_CLANG)
if (VERBOSE)
@@ -670,17 +676,17 @@ elseif (CMAKE_COMPILER_IS_CLANG)
set(BASE_FLAGS "-Wall -Wextra -Wno-unused-parameter ${BASE_FLAGS}")
- set(CMAKE_C_FLAGS "-g" CACHE INTERNAL "default C compiler flags")
- set(CMAKE_C_FLAGS_DEBUG "-O0 -g -D_DEBUG=1" CACHE INTERNAL "C debug flags")
- set(CMAKE_C_FLAGS_MINSIZEREL "-Os" CACHE INTERNAL "C minimal size flags")
- set(CMAKE_C_FLAGS_RELEASE "-O3 -fomit-frame-pointer" CACHE INTERNAL "C release flags")
- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -g -fno-omit-frame-pointer" CACHE INTERNAL "C release with debug info flags")
+ #set(CMAKE_C_FLAGS "-g" CACHE INTERNAL "default C compiler flags")
+ set(CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS} CACHE INTERNAL "C debug flags")
+ set(CMAKE_C_FLAGS_MINSIZEREL ${CMAKE_C_FLAGS} CACHE INTERNAL "C minimal size flags")
+ set(CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS} CACHE INTERNAL "C release flags")
+ set(CMAKE_C_FLAGS_RELWITHDEBINFO ${CMAKE_C_FLAGS} CACHE INTERNAL "C release with debug info flags")
- set(CMAKE_CXX_FLAGS "-g -Wnon-virtual-dtor" CACHE INTERNAL "default C++ compiler flags")
- set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -D_DEBUG=1" CACHE INTERNAL "C++ debug flags")
- set(CMAKE_CXX_FLAGS_MINSIZEREL "-Os" CACHE INTERNAL "C++ minimal size flags")
- set(CMAKE_CXX_FLAGS_RELEASE "-O3 -fomit-frame-pointer" CACHE INTERNAL "C++ release flags")
- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -g -fno-omit-frame-pointer" CACHE INTERNAL "C++ release with debug info flags")
+ #set(CMAKE_CXX_FLAGS "-g -Wnon-virtual-dtor" CACHE INTERNAL "default C++ compiler flags")
+ set(CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS} CACHE INTERNAL "C++ debug flags")
+ set(CMAKE_CXX_FLAGS_MINSIZEREL ${CMAKE_CXX_FLAGS} CACHE INTERNAL "C++ minimal size flags")
+ set(CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS} CACHE INTERNAL "C++ release flags")
+ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS} CACHE INTERNAL "C++ release with debug info flags")
elseif (MSVC)
if (VERBOSE)