Browse Source

fixed some cmake warnings

Former-commit-id: b0faeb6d698161a5ab953707111d6e2bab061abe
schuellc 10 năm trước cách đây
mục cha
commit
f2c785b9f7
2 tập tin đã thay đổi với 2 bổ sung6 xóa
  1. 1 5
      include/igl/viewer/ViewerCore.cpp
  2. 1 1
      tutorial/CMakeLists.shared

+ 1 - 5
include/igl/viewer/ViewerCore.cpp

@@ -16,10 +16,6 @@
 #include <Eigen/Geometry>
 #include <iostream>
 
-#ifdef _WIN32
-#  undef DrawText
-#endif
-
 #ifdef ENABLE_SERIALIZATION
 #include <igl/serialize.h>
 namespace igl {
@@ -246,7 +242,7 @@ IGL_INLINE void igl::viewer::ViewerCore::draw(ViewerData& data, OpenGL_state& op
     {
       textrenderer.BeginDraw(view*model, proj, viewport, object_scale);
       for (int i=0; i<data.V.rows(); ++i)
-        textrenderer.DrawText(data.V.row(i), data.V_normals.row(i), to_string(i));
+        textrenderer.DrawText(data.V.row(i),data.V_normals.row(i),to_string(i));
       textrenderer.EndDraw();
     }
 

+ 1 - 1
tutorial/CMakeLists.shared

@@ -79,7 +79,7 @@ ENDIF(CMAKE_BUILD_TYPE MATCHES RELEASE)
 
 
 
-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-register")
 endif()