From a160f39457e8dc0947dc5d6865c020a285a50df6 Mon Sep 17 00:00:00 2001 From: salinasd Date: Tue, 27 Jan 2015 11:44:49 +0000 Subject: compatibility vs2013 git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@429 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 1ce2e6b9c85e603715e8f1f63715263f9bd09702 --- src/GudhUI/CMakeLists.txt | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/GudhUI/CMakeLists.txt') diff --git a/src/GudhUI/CMakeLists.txt b/src/GudhUI/CMakeLists.txt index 4c0c2087..769e1d30 100644 --- a/src/GudhUI/CMakeLists.txt +++ b/src/GudhUI/CMakeLists.txt @@ -3,19 +3,23 @@ project(GudhUI) #Specify Gudhi's path here #for instance -SET(Gudhi_Path "/home/dsalinas/Documents/CodeSVN/gudhi/src/include") +set(Gudhi_Path "C:/Users/dsalinas/Documents/Recherche/Code/c++/Gudhi_library_1.1.0/include") +#set(Gudhi_Path "/home/dsalinas/Documents/CodeSVN/gudhi/src/include") +if(MSVC) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4267 /wd4668 /wd4311 /wd4800 /wd4820 /wd4503 /wd4244 /wd4345 /wd4996 /wd4396 /wd4018 -frounding-math") +else() + list(APPEND CMAKE_CXX_FLAGS "-std=c++11 -Wall -pedantic -frounding-math") +endif() set(EXECUTABLE_OUTPUT_PATH bin/${CMAKE_BUILD_TYPE}) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -frounding-math -Wall -pedantic") - find_package(Boost REQUIRED COMPONENTS) find_package(CGAL COMPONENTS Qt4) find_package(Qt4) find_package(OpenGL) find_package(QGLViewer) -if ( CGAL_FOUND AND CGAL_Qt4_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND ) +if ( CGAL_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND ) set( QT_USE_QTXML TRUE ) set( QT_USE_QTMAIN TRUE ) -- cgit v1.2.3