Changeset: c54e22bc5cd5 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c54e22bc5cd5
Modified Files:
CMakeLists.txt
geom/monetdb5/libgeom.h
Branch: cmake-fun
Log Message:
Compiles and runs on Mac OS X
diffs (31 lines):
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1186,10 +1186,11 @@ else() #GCC, clang and Apple clang
MT_addCompilerFlag("-fomit-frame-pointer" "-fomit-frame-pointer"
"${CMAKE_C_FLAGS_MINSIZEREL}" "MinSizeRel" CMAKE_C_FLAGS_MINSIZEREL)
# Linker flags
- MT_addCompilerFlag("-Wl,-Bsymbolic-functions"
"-Wl,-Bsymbolic-functions" "${LINK_OPTIONS}" "all" LINK_OPTIONS)
if(${CMAKE_C_COMPILER_ID} STREQUAL "AppleClang")
MT_addCompilerFlag("-Wl,-undefined,dynamic_lookup"
"-Wl,-undefined,dynamic_lookup" "${CMAKE_SHARED_LINKER_FLAGS}" "all shared
libraries" CMAKE_SHARED_LINKER_FLAGS)
MT_addCompilerFlag("-Wl,-undefined,dynamic_lookup"
"-Wl,-undefined,dynamic_lookup" "${CMAKE_MODULE_LINKER_FLAGS}" "all shared
library modules" CMAKE_MODULE_LINKER_FLAGS)
+ else()
+ MT_addCompilerFlag("-Wl,-Bsymbolic-functions"
"-Wl,-Bsymbolic-functions" "${LINK_OPTIONS}" "all" LINK_OPTIONS)
endif()
endif()
diff --git a/geom/monetdb5/libgeom.h b/geom/monetdb5/libgeom.h
--- a/geom/monetdb5/libgeom.h
+++ b/geom/monetdb5/libgeom.h
@@ -29,7 +29,10 @@
#include <geos_c.h>
#ifdef HAVE_PROJ
-#include <proj_api.h> //it is needed to transform from one srid to another
+#ifndef ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+#endif
+#include <proj_api.h> //it is needed to transform from one srid to another
TODO proj_api.h is deprecated and should be replace with a more modern version
#endif
/* geos does not support 3d envelope */
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
