1
0
Fork 0

Try to fix build with CGAL under MSVC

This commit is contained in:
Christian Schmitt 2012-11-11 19:07:15 +01:00
parent 858191ead9
commit 820c9a6b5d
2 changed files with 5 additions and 5 deletions

View file

@ -83,6 +83,8 @@ if (CGAL_FOUND)
endif(${CGAL_MAJOR_VERSION}.${CGAL_MINOR_VERSION} VERSION_LESS 4.0)
endif (CGAL_FOUND)
include ( ${CGAL_USE_FILE} )
if (CMAKE_CL_64)
find_package(JPEG) # needed for SRTM
endif (CMAKE_CL_64)
@ -106,7 +108,7 @@ if(WIN32)
# foreach(warning 4244 4251 4267 4275 4290 4786 4305 4996)
# SET(WARNING_FLAGS "${WARNING_FLAGS} /wd${warning}")
# endforeach(warning)
set(MSVC_FLAGS "-DNOMINMAX -D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS -D__CRT_NONSTDC_NO_WARNINGS -DNO_TIMER")
if (${MSVC_VERSION} EQUAL 1600)
set( MSVC_LD_FLAGS "/FORCE:MULTIPLE" )
@ -114,7 +116,7 @@ if(WIN32)
endif(MSVC)
set(NOMINMAX 1)
endif(WIN32)
endif(WIN32)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_FLAGS} ${MSVC_FLAGS} -D_REENTRANT")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS} ${MSVC_FLAGS} -D_REENTRANT -DNO_OPENSCENEGRAPH_INTERFACE")

View file

@ -1,8 +1,6 @@
include_directories(${GDAL_INCLUDE_DIR})
include( ${CGAL_USE_FILE} )
add_library(Geometry STATIC
add_library(Geometry STATIC
contour_tree.cxx
line.cxx
poly_support.cxx