fix: build demo3d on osx

Signed-off-by: Zone.N <[email protected]>
Simple-XX · Oct 31, 2023 · dab0861 · dab0861
1 parent 71e3c75
commit dab0861
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 18 deletions.
diff --git a/test/system_test/CMakeLists.txt b/test/system_test/CMakeLists.txt
@@ -11,5 +11,5 @@ project(
 )
 
 add_subdirectory(demo2d)
-# add_subdirectory(demo3d)
+add_subdirectory(demo3d)
 # add_subdirectory(demo_old)
diff --git a/test/system_test/demo3d/CMakeLists.txt b/test/system_test/demo3d/CMakeLists.txt
@@ -20,28 +20,31 @@ add_executable(demo3d
         dtkScene.cpp
 )
 
-target_include_directories(demo3d PRIVATE
-        ./
-        ../
-        ../engine/dtk
-        ../engine/math
-        ../engine/physics
+target_include_directories(${PROJECT_NAME} PRIVATE
+        include
 )
 
-target_link_libraries(demo3d PRIVATE
-        dtk
-        Boost::headers
-        Boost::dynamic_linking
-        CGAL
+target_link_libraries(${PROJECT_NAME} PRIVATE
+        Eigen
         GLUT::GLUT
-        glfw
         glm
-        Eigen
         OpenGL::GL
-        glut
-        GLU
 )
 
+# target_link_libraries(demo3d PRIVATE
+#         dtk
+#         Boost::headers
+#         Boost::dynamic_linking
+#         CGAL
+#         GLUT::GLUT
+#         glfw
+#         glm
+#         Eigen
+#         OpenGL::GL
+#         glut
+#         GLU
+# )
+
 target_compile_definitions(demo3d PRIVATE
 #        $<VTK_OPT:USE_VTK>
 )

diff --git a/test/system_test/demo3d/main.cpp b/test/system_test/demo3d/main.cpp
@@ -196,7 +196,7 @@ void keyboard(unsigned char key, int x, int y) {
 			break;
 		}
 	case 27:
-		glutLeaveMainLoop();
+		// glutLeaveMainLoop();
 		break;
 	default:
 		break;
@@ -215,7 +215,7 @@ void gl_vis(int argc, char* argv[])
 	glutDisplayFunc(&display);
 	glutReshapeFunc(&reshape);
 	glutIdleFunc(&idle);
-	glutSetOption(GLUT_ACTION_ON_WINDOW_CLOSE, GLUT_ACTION_CONTINUE_EXECUTION);
+	// glutSetOption(GLUT_ACTION_ON_WINDOW_CLOSE, GLUT_ACTION_CONTINUE_EXECUTION);
 	glutMainLoop();
 }