diff options
| author | salinasd <salinasd@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2015-01-27 15:09:04 +0000 |
|---|---|---|
| committer | salinasd <salinasd@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2015-01-27 15:09:04 +0000 |
| commit | e8e889c52c96a3055a1237c389186cb08b0f6708 (patch) | |
| tree | c7879f69d52a9cdde35f38ac2718ec9d8ce7815a /src/GudhUI/CMakeLists.txt | |
| parent | d7a3c90ef611b1c104b6a4ee900b56bf39d56cf5 (diff) | |
critical poitns
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@432 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 27e660f593f25a00cbd8b1794ed83bb76fd34eea
Diffstat (limited to 'src/GudhUI/CMakeLists.txt')
| -rw-r--r-- | src/GudhUI/CMakeLists.txt | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/GudhUI/CMakeLists.txt b/src/GudhUI/CMakeLists.txt index 769e1d30..b62be8ff 100644 --- a/src/GudhUI/CMakeLists.txt +++ b/src/GudhUI/CMakeLists.txt @@ -3,12 +3,12 @@ project(GudhUI) #Specify Gudhi's path here #for instance -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") +#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") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -pedantic -frounding-math") endif() set(EXECUTABLE_OUTPUT_PATH bin/${CMAKE_BUILD_TYPE}) @@ -16,11 +16,10 @@ set(EXECUTABLE_OUTPUT_PATH bin/${CMAKE_BUILD_TYPE}) find_package(Boost REQUIRED COMPONENTS) find_package(CGAL COMPONENTS Qt4) find_package(Qt4) -find_package(OpenGL) find_package(QGLViewer) +find_package(OpenGL) if ( CGAL_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND ) - set( QT_USE_QTXML TRUE ) set( QT_USE_QTMAIN TRUE ) set( QT_USE_QTSCRIPT TRUE ) @@ -38,7 +37,7 @@ if ( CGAL_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND ) include_directories(.) include_directories(${Gudhi_Path}) - + # qt : ui file, created wih Qt Designer ############### set(CMAKE_CURRENT_BINARY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/gui") qt4_wrap_ui( uis |