build: update cmake, build engine on osx but demo2d cannot find glut

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

Hide file tree

Showing 17 changed files with 64 additions and 45 deletions.
diff --git a/cmake/3rd.cmake b/cmake/3rd.cmake
@@ -205,7 +205,7 @@ if (NOT CGAL_FOUND)
             "Following https://doc.cgal.org/latest/Manual/devman_create_and_use_a_cmakelist.html to install.")
 endif ()
 
-find_package(Boost REQUIRED)
+find_package(Boost COMPONENTS thread REQUIRED)
 if (NOT Boost_FOUND)
     message(FATAL_ERROR "Boost not found.\n"
             "Following https://www.boost.org to install.")

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -4,7 +4,7 @@
 #
 # CMakeLists.txt for Simple-XX/SimplePhysicsEngine.
 
-add_library(${PROJECT_NAME}-static STATIC
+set(lib_src
         dtk/dtk.cpp
         dtk/dtkAssert.cpp
         dtk/dtkCollisionDetectBasic.cpp
@@ -51,6 +51,34 @@ add_library(${PROJECT_NAME}-static STATIC
         physics/dtkRigidBody.cpp
 )
 
+add_library(${PROJECT_NAME}-shared SHARED
+        ${lib_src}
+)
+
+target_include_directories(${PROJECT_NAME}-shared PRIVATE 
+        $<BUILD_INTERFACE:
+        ${PROJECT_SOURCE_DIR}/src/dtk
+        ${PROJECT_SOURCE_DIR}/src/math
+        ${PROJECT_SOURCE_DIR}/src/physics
+        >
+
+        $<INSTALL_INTERFACE:include/${PROJECT_NAME}-${PROJECT_VERSION}>
+
+)
+
+target_link_libraries(${PROJECT_NAME}-shared PRIVATE
+        ${DEFAULT_LINK_LIB}
+        Boost::boost
+        Boost::thread
+        CGAL
+        glfw
+        glm::glm
+)
+
+add_library(${PROJECT_NAME}-static STATIC
+        ${lib_src}
+)
+
 target_include_directories(${PROJECT_NAME}-static PRIVATE 
         $<BUILD_INTERFACE:
         ${PROJECT_SOURCE_DIR}/src/dtk
@@ -63,7 +91,9 @@ target_include_directories(${PROJECT_NAME}-static PRIVATE
 )
 
 target_link_libraries(${PROJECT_NAME}-static PRIVATE
-        Boost::headers
+        ${DEFAULT_LINK_LIB}
+        Boost::boost
+        Boost::thread
         CGAL
         glfw
         glm::glm
@@ -73,13 +103,13 @@ target_link_libraries(${PROJECT_NAME}-static PRIVATE
 # @todo 导出静态库与动态库
 packageProject(
         # 要导出的 target
-        NAME ${PROJECT_NAME}-static
+        NAME ${PROJECT_NAME}-shared
         # 版本
         VERSION ${PROJECT_VERSION}
         # 生成文件目录
         BINARY_DIR ${PROJECT_BINARY_DIR}
         # 头文件路径
-        INCLUDE_DIR ${PROJECT_SOURCE_DIR}/src
+        INCLUDE_DIR ${PROJECT_SOURCE_DIR}/src/dtk ${PROJECT_SOURCE_DIR}/src/math ${PROJECT_SOURCE_DIR}/src/physics
         # 与 target 的 INSTALL_INTERFACE 一致
         INCLUDE_DESTINATION include/${PROJECT_NAME}-${PROJECT_VERSION}
         # 头文件过滤

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -13,8 +13,12 @@ project(
 enable_testing()
 include(GoogleTest)
 
+enable_language(CXX)
+
 include_directories(
-        ${SimplePhysicsEngine_SOURCE_DIR}/src/include
+        ${SimplePhysicsEngine_SOURCE_DIR}/src/dtk
+        ${SimplePhysicsEngine_SOURCE_DIR}/src/math
+        ${SimplePhysicsEngine_SOURCE_DIR}/src/physics
 )
 
 list(APPEND DEFAULT_TEST_COMPILE_OPTIONS
@@ -35,7 +39,7 @@ link_libraries(
         ${DEFAULT_LINK_LIB}
         gtest_main
         ${glog_LIBRARIES}
-        SimplePhysicsEngine-static
+        SimplePhysicsEngine-shared
 )
 
 add_subdirectory(unit_test)

diff --git a/test/system_test/CMakeLists.txt b/test/system_test/CMakeLists.txt
@@ -10,21 +10,6 @@ project(
         VERSION 0.0.1
 )
 
-enable_language(CXX)
-
-# add_executable(system_test
-#         main.cpp
-#         display.cpp
-# )
-
-# target_compile_options(system_test PRIVATE
-#         ${DEFAULT_TEST_COMPILE_OPTIONS}
-# )
-
-# target_link_options(system_test PRIVATE
-#         ${DEFAULT_TEST_LINK_OPTIONS}
-# )
-
 add_subdirectory(demo2d)
 # add_subdirectory(demo3d)
 # add_subdirectory(demo_old)
diff --git a/test/system_test/demo2d/CMakeLists.txt b/test/system_test/demo2d/CMakeLists.txt
@@ -6,35 +6,26 @@
 
 project(demo2d)
 
-file(GLOB_RECURSE demo2d_FILES
-        "${PROJECT_SOURCE_DIR}/include/*.h"
-        "${PROJECT_SOURCE_DIR}/src/*.cpp"
-)
-
 add_executable(${PROJECT_NAME}
-        ${demo2d_FILES}
+        Constants.cpp
+        dtkCollisionPair.cpp
+        dtkFemSimulation.cpp
+        dtkMesh.cpp
+        dtkObject.cpp
+        dtkScene.cpp
+        Grid.cpp
+        Main.cpp
+        Particle.cpp
+        SPHSolver.cpp
 )
 
 target_include_directories(${PROJECT_NAME} PRIVATE
         include
-        ../
-        ../engine/dtk
-        ../engine/math
-        ../engine/physics
 )
 
 target_link_libraries(${PROJECT_NAME} PRIVATE
-        dtk
-        Boost::headers
-        Boost::dynamic_linking
-        CGAL
         Eigen
-        glut
         GLUT::GLUT
-        glfw
         glm
         OpenGL::GL
-        OpenGL::GLU 
 )
-
-message("GLUT_glut_LIBRARY: ${GLUT_glut_LIBRARY}")
diff --git a/test/system_test/demo2d/src/Constants.cpp → test/system_test/demo2d/Constants.cpp b/test/system_test/demo2d/src/Constants.cpp → test/system_test/demo2d/Constants.cpp
diff --git a/test/system_test/demo2d/src/Grid.cpp → test/system_test/demo2d/Grid.cpp b/test/system_test/demo2d/src/Grid.cpp → test/system_test/demo2d/Grid.cpp
diff --git a/test/system_test/demo2d/src/Main.cpp → test/system_test/demo2d/Main.cpp b/test/system_test/demo2d/src/Main.cpp → test/system_test/demo2d/Main.cpp
@@ -1,8 +1,10 @@
-#include "GL/freeglut.h"
+
 #include <chrono>
 #include <cmath>
 #include <iostream>
 
+#include "GL/freeglut.h"
+
 #include "dtkScene.h"
 #include "dtkFemSimulation.h"
 

diff --git a/test/system_test/demo2d/src/Particle.cpp → test/system_test/demo2d/Particle.cpp b/test/system_test/demo2d/src/Particle.cpp → test/system_test/demo2d/Particle.cpp
diff --git a/test/system_test/demo2d/src/SPHSolver.cpp → test/system_test/demo2d/SPHSolver.cpp b/test/system_test/demo2d/src/SPHSolver.cpp → test/system_test/demo2d/SPHSolver.cpp
diff --git a/...stem_test/demo2d/src/dtkCollisionPair.cpp → test/system_test/demo2d/dtkCollisionPair.cpp b/...stem_test/demo2d/src/dtkCollisionPair.cpp → test/system_test/demo2d/dtkCollisionPair.cpp
diff --git a/...stem_test/demo2d/src/dtkFemSimulation.cpp → test/system_test/demo2d/dtkFemSimulation.cpp b/...stem_test/demo2d/src/dtkFemSimulation.cpp → test/system_test/demo2d/dtkFemSimulation.cpp
diff --git a/test/system_test/demo2d/src/dtkMesh.cpp → test/system_test/demo2d/dtkMesh.cpp b/test/system_test/demo2d/src/dtkMesh.cpp → test/system_test/demo2d/dtkMesh.cpp
diff --git a/test/system_test/demo2d/src/dtkObject.cpp → test/system_test/demo2d/dtkObject.cpp b/test/system_test/demo2d/src/dtkObject.cpp → test/system_test/demo2d/dtkObject.cpp
diff --git a/test/system_test/demo2d/src/dtkScene.cpp → test/system_test/demo2d/dtkScene.cpp b/test/system_test/demo2d/src/dtkScene.cpp → test/system_test/demo2d/dtkScene.cpp
@@ -1,5 +1,7 @@
 #include "dtkScene.h"
 
+namespace dtk {
+
 dtkScene::dtkScene(unsigned int width, unsigned int height) 
     : State(SCENE_ACTIVE), Keys(), KeysProcessed(), Width(width), Height(height)
 { 
@@ -65,4 +67,6 @@ void dtkScene::Render()
 
 void dtkScene::DoCollisions()
 {
-}
+}
+
+}
diff --git a/test/system_test/demo2d/include/dtkCollisionPair.h b/test/system_test/demo2d/include/dtkCollisionPair.h
@@ -5,7 +5,9 @@
 
 #include <memory>
 #include <array>
-#include <engine/physics/dtkRigidBody.h>
+
+#include <dtkRigidBody.h>
+
 #include "dtkMesh.h"
 
 namespace dtk {

diff --git a/test/system_test/demo2d/include/dtkMesh.h b/test/system_test/demo2d/include/dtkMesh.h
@@ -5,7 +5,8 @@
 
 #include <Eigen/Dense>
 
-#include <engine/physics/dtkRigidBody.h>
+#include <dtkRigidBody.h>
+
 #include "dtkObject.h"
 
 using namespace Eigen;