Explorar o código

updated cmake version

Former-commit-id: 2cd2d177807e6839ac0f214a12efcf502b58cf92
Romain Prévost %!s(int64=9) %!d(string=hai) anos
pai
achega
5548464b67
Modificáronse 52 ficheiros con 55 adicións e 52 borrados
  1. 1 1
      optional/CMakeLists.txt
  2. 1 1
      python/CMakeLists.txt
  3. 4 1
      shared/cmake/CMakeLists.txt
  4. 1 1
      tutorial/101_FileIO/CMakeLists.txt
  5. 1 1
      tutorial/102_DrawMesh/CMakeLists.txt
  6. 1 1
      tutorial/103_Events/CMakeLists.txt
  7. 1 1
      tutorial/104_Colors/CMakeLists.txt
  8. 1 1
      tutorial/105_Overlays/CMakeLists.txt
  9. 1 1
      tutorial/106_ViewerMenu/CMakeLists.txt
  10. 1 1
      tutorial/201_Normals/CMakeLists.txt
  11. 1 1
      tutorial/202_GaussianCurvature/CMakeLists.txt
  12. 1 1
      tutorial/203_CurvatureDirections/CMakeLists.txt
  13. 1 1
      tutorial/204_Gradient/CMakeLists.txt
  14. 1 1
      tutorial/205_Laplacian/CMakeLists.txt
  15. 1 1
      tutorial/301_Slice/CMakeLists.txt
  16. 1 1
      tutorial/302_Sort/CMakeLists.txt
  17. 1 1
      tutorial/303_LaplaceEquation/CMakeLists.txt
  18. 1 1
      tutorial/304_LinearEqualityConstraints/CMakeLists.txt
  19. 1 1
      tutorial/305_QuadraticProgramming/CMakeLists.txt
  20. 1 1
      tutorial/306_EigenDecomposition/CMakeLists.txt
  21. 1 1
      tutorial/401_BiharmonicDeformation/CMakeLists.txt
  22. 1 1
      tutorial/402_PolyharmonicDeformation/CMakeLists.txt
  23. 1 1
      tutorial/403_BoundedBiharmonicWeights/CMakeLists.txt
  24. 1 1
      tutorial/404_DualQuaternionSkinning/CMakeLists.txt
  25. 1 1
      tutorial/405_AsRigidAsPossible/CMakeLists.txt
  26. 1 1
      tutorial/406_FastAutomaticSkinningTransformations/CMakeLists.txt
  27. 1 1
      tutorial/407_BiharmonicCoordinates/CMakeLists.txt
  28. 1 1
      tutorial/501_HarmonicParam/CMakeLists.txt
  29. 1 1
      tutorial/502_LSCMParam/CMakeLists.txt
  30. 1 1
      tutorial/503_ARAPParam/CMakeLists.txt
  31. 1 1
      tutorial/504_NRosyDesign/CMakeLists.txt
  32. 1 1
      tutorial/505_MIQ/CMakeLists.txt
  33. 1 1
      tutorial/506_FrameField/CMakeLists.txt
  34. 1 1
      tutorial/507_PolyVectorField/CMakeLists.txt
  35. 1 1
      tutorial/508_ConjugateField/CMakeLists.txt
  36. 1 1
      tutorial/509_Planarization/CMakeLists.txt
  37. 1 1
      tutorial/510_Integrable/CMakeLists.txt
  38. 1 1
      tutorial/601_Serialization/CMakeLists.txt
  39. 1 1
      tutorial/602_Matlab/CMakeLists.txt
  40. 1 1
      tutorial/604_Triangle/CMakeLists.txt
  41. 1 1
      tutorial/605_Tetgen/CMakeLists.txt
  42. 1 1
      tutorial/606_AmbientOcclusion/CMakeLists.txt
  43. 1 1
      tutorial/607_Picking/CMakeLists.txt
  44. 1 1
      tutorial/608_LIM/CMakeLists.txt
  45. 1 1
      tutorial/609_Boolean/CMakeLists.txt
  46. 1 1
      tutorial/610_CSGTree/CMakeLists.txt
  47. 1 1
      tutorial/701_Statistics/CMakeLists.txt
  48. 1 1
      tutorial/702_WindingNumber/CMakeLists.txt
  49. 1 1
      tutorial/703_Decimation/CMakeLists.txt
  50. 1 1
      tutorial/704_SignedDistance/CMakeLists.txt
  51. 1 1
      tutorial/705_MarchingCubes/CMakeLists.txt
  52. 1 1
      tutorial/CMakeLists.txt

+ 1 - 1
optional/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 project(libigl)
 
 ### Compilation flags: adapt to your needs ###

+ 1 - 1
python/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8.12)
 project(pybind)
 
 ### Compilation flags: adapt to your needs ###

+ 4 - 1
shared/cmake/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8.12)
 project(libigl)
 
 ### Available options ###
@@ -245,6 +245,9 @@ if(LIBIGL_WITH_OPENGL)
   if(LIBIGL_USE_STATIC_LIBRARY)
     CompileIGL_Module("opengl")
     CompileIGL_Module("opengl2")
+    if(WIN32)
+      target_include_directories(iglopengl2 "${LIBIGL_EXTERNAL}/nanogui/ext/glew")
+    endif()
   endif()
 
   if(LIBIGL_WITH_PNG)

+ 1 - 1
tutorial/101_FileIO/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 project(101_FileIO)
 
 add_executable(${PROJECT_NAME}_bin

+ 1 - 1
tutorial/102_DrawMesh/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 project(102_DrawMesh)
 
 add_executable(${PROJECT_NAME}_bin

+ 1 - 1
tutorial/103_Events/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 project(103_Events)
 
 add_executable(${PROJECT_NAME}_bin

+ 1 - 1
tutorial/104_Colors/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 project(104_Colors)
 
 add_executable(${PROJECT_NAME}_bin

+ 1 - 1
tutorial/105_Overlays/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 project(105_Overlays)
 
 add_executable(${PROJECT_NAME}_bin

+ 1 - 1
tutorial/106_ViewerMenu/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 project(106_ViewerMenu)
 
 add_executable(${PROJECT_NAME}_bin

+ 1 - 1
tutorial/201_Normals/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 project(201_Normals)
 
 add_executable(${PROJECT_NAME}_bin

+ 1 - 1
tutorial/202_GaussianCurvature/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 project(202_GaussianCurvature)
 
 add_executable(${PROJECT_NAME}_bin

+ 1 - 1
tutorial/203_CurvatureDirections/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 project(203_CurvatureDirections)
 
 add_executable(${PROJECT_NAME}_bin

+ 1 - 1
tutorial/204_Gradient/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 project(204_Gradient)
 
 add_executable(${PROJECT_NAME}_bin

+ 1 - 1
tutorial/205_Laplacian/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 project(205_Laplacian)
 
 add_executable(${PROJECT_NAME}_bin

+ 1 - 1
tutorial/301_Slice/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 project(301_Slice)
 
 add_executable(${PROJECT_NAME}_bin

+ 1 - 1
tutorial/302_Sort/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 project(302_Sort)
 
 add_executable(${PROJECT_NAME}_bin

+ 1 - 1
tutorial/303_LaplaceEquation/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 project(303_LaplaceEquation)
 
 add_executable(${PROJECT_NAME}_bin

+ 1 - 1
tutorial/304_LinearEqualityConstraints/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 project(304_LinearEqualityConstraints)
 
 add_executable(${PROJECT_NAME}_bin

+ 1 - 1
tutorial/305_QuadraticProgramming/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 project(305_QuadraticProgramming)
 
 add_executable(${PROJECT_NAME}_bin

+ 1 - 1
tutorial/306_EigenDecomposition/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 project(306_EigenDecomposition)
 
 add_executable(${PROJECT_NAME}_bin

+ 1 - 1
tutorial/401_BiharmonicDeformation/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 project(401_BiharmonicDeformation)
 
 add_executable(${PROJECT_NAME}_bin

+ 1 - 1
tutorial/402_PolyharmonicDeformation/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 project(402_PolyharmonicDeformation)
 
 add_executable(${PROJECT_NAME}_bin

+ 1 - 1
tutorial/403_BoundedBiharmonicWeights/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 project(403_BoundedBiharmonicWeights)
 
 add_executable(${PROJECT_NAME}_bin

+ 1 - 1
tutorial/404_DualQuaternionSkinning/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 project(404_DualQuaternionSkinning)
 
 add_executable(${PROJECT_NAME}_bin

+ 1 - 1
tutorial/405_AsRigidAsPossible/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 project(405_AsRigidAsPossible)
 
 add_executable(${PROJECT_NAME}_bin

+ 1 - 1
tutorial/406_FastAutomaticSkinningTransformations/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 project(406_FastAutomaticSkinningTransformations)
 
 add_executable(${PROJECT_NAME}_bin

+ 1 - 1
tutorial/407_BiharmonicCoordinates/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 project(407_BiharmonicCoordinates)
 
 add_executable(${PROJECT_NAME}_bin

+ 1 - 1
tutorial/501_HarmonicParam/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 project(501_HarmonicParam)
 
 add_executable(${PROJECT_NAME}_bin

+ 1 - 1
tutorial/502_LSCMParam/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 project(502_LSCMParam)
 
 add_executable(${PROJECT_NAME}_bin

+ 1 - 1
tutorial/503_ARAPParam/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 project(503_ARAPParam)
 
 add_executable(${PROJECT_NAME}_bin

+ 1 - 1
tutorial/504_NRosyDesign/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 project(504_NRosyDesign)
 
 add_executable(${PROJECT_NAME}_bin

+ 1 - 1
tutorial/505_MIQ/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 project(505_MIQ)
 
 add_executable(${PROJECT_NAME}_bin

+ 1 - 1
tutorial/506_FrameField/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 project(506_FrameField)
 
 add_executable(${PROJECT_NAME}_bin

+ 1 - 1
tutorial/507_PolyVectorField/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 project(507_PolyVectorField)
 
 add_executable(${PROJECT_NAME}_bin

+ 1 - 1
tutorial/508_ConjugateField/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 project(508_ConjugateField)
 
 add_executable(${PROJECT_NAME}_bin

+ 1 - 1
tutorial/509_Planarization/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 project(509_Planarization)
 
 add_executable(${PROJECT_NAME}_bin

+ 1 - 1
tutorial/510_Integrable/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 project(510_Integrable)
 
 add_executable(${PROJECT_NAME}_bin

+ 1 - 1
tutorial/601_Serialization/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 project(601_Serialization)
 
 add_executable(${PROJECT_NAME}_bin

+ 1 - 1
tutorial/602_Matlab/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 project(602_Matlab)
 
 add_executable(${PROJECT_NAME}_bin

+ 1 - 1
tutorial/604_Triangle/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 project(604_Triangle)
 
 add_executable(${PROJECT_NAME}_bin

+ 1 - 1
tutorial/605_Tetgen/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 project(605_Tetgen)
 
 add_executable(${PROJECT_NAME}_bin

+ 1 - 1
tutorial/606_AmbientOcclusion/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 project(606_AmbientOcclusion)
 
 add_executable(${PROJECT_NAME}_bin

+ 1 - 1
tutorial/607_Picking/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 project(607_Picking)
 
 include_directories(${LIBIGL_INCLUDE_DIRS})

+ 1 - 1
tutorial/608_LIM/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 project(608_LIM)
 
 ### OpenMP ###

+ 1 - 1
tutorial/609_Boolean/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 project(609_Boolean)
 
 include_directories(${LIBIGL_INCLUDE_DIRS})

+ 1 - 1
tutorial/610_CSGTree/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 project(610_CSGTree)
 
 add_executable(${PROJECT_NAME}_bin

+ 1 - 1
tutorial/701_Statistics/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 project(701_Statistics)
 
 include_directories(${LIBIGL_INCLUDE_DIRS})

+ 1 - 1
tutorial/702_WindingNumber/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 project(702_WindingNumber)
 
 add_executable(${PROJECT_NAME}_bin

+ 1 - 1
tutorial/703_Decimation/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 project(703_Decimation)
 
 include_directories(${LIBIGL_INCLUDE_DIRS})

+ 1 - 1
tutorial/704_SignedDistance/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 project(704_SignedDistance)
 
 add_executable(${PROJECT_NAME}_bin

+ 1 - 1
tutorial/705_MarchingCubes/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 project(705_MarchingCubes)
 
 include_directories(${LIBIGL_INCLUDE_DIRS})

+ 1 - 1
tutorial/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 project(libigl_tutorials)
 
 ### libIGL options: choose between header only and compiled static library