Merge pull request #3 from ascentai/feature/modernize-cmake

Feature/modernize cmake
KavrakiLab · May 6, 2022 · 6c73d61 · 6c73d61
2 parents f8cd400 + e7c5f8b
commit 6c73d61
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/gl_depth_sim/CMakeLists.txt b/gl_depth_sim/CMakeLists.txt
@@ -1,11 +1,16 @@
 cmake_minimum_required(VERSION 3.5.0)
 project(gl_depth_sim VERSION 0.2.0 LANGUAGES C CXX)
 
+SET(CMAKE_CXX_STANDARD 14)
+SET(CMAKE_CXX_EXTENSIONS OFF)
+
+
 # Required for core functionality
-find_package(OpenGL REQUIRED)
 find_package(Eigen3 REQUIRED)
-find_package(PCL REQUIRED)
+find_package(PCL REQUIRED common io)
+
 find_package(OpenCV REQUIRED)
+SET(OpenGL_GL_PREFERENCE "GLVND")
 
 find_package(Threads REQUIRED)
 set(THREADS_PREFER_PTHREAD_FLAG ON)
@@ -27,26 +32,22 @@ add_library(${PROJECT_NAME} SHARED
   src/${PROJECT_NAME}/mesh.cpp
   src/${PROJECT_NAME}/renderable_mesh.cpp
   src/${PROJECT_NAME}/shader_program.cpp)
-target_compile_options(${PROJECT_NAME} PRIVATE -std=c++14)
-target_compile_options(${PROJECT_NAME} PUBLIC -mno-avx -pthread)
+target_compile_options(${PROJECT_NAME} PUBLIC -mno-avx)
 target_include_directories(${PROJECT_NAME} PUBLIC
     "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
     "$<INSTALL_INTERFACE:include>")
-target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC
-    ${EIGEN3_INCLUDE_DIR})
 target_link_libraries(${PROJECT_NAME} PUBLIC
   ${ASSIMP_LIBRARIES}
-  ${OPENGL_LIBRARIES}
   glad
   dl
-  glfw
+  Threads::Threads
+  Eigen3::Eigen
   )
 
 # Libaries for interfacing with opencv and pcl
 add_library(${PROJECT_NAME}_interfaces SHARED
   src/interfaces/pcl_interface.cpp
   src/interfaces/opencv_interface.cpp)
-target_compile_options(${PROJECT_NAME}_interfaces PRIVATE -std=c++14)
 target_include_directories(${PROJECT_NAME} PUBLIC
     "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
     "$<INSTALL_INTERFACE:include>")
@@ -62,7 +63,6 @@ target_link_libraries(${PROJECT_NAME}_interfaces PUBLIC
 add_library(${PROJECT_NAME}_laser_scanner SHARED
   src/${PROJECT_NAME}/sim_laser_scanner.cpp
 )
-target_compile_options(${PROJECT_NAME}_laser_scanner PRIVATE -std=c++14)
 target_include_directories(${PROJECT_NAME} PUBLIC
     "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
     "$<INSTALL_INTERFACE:include>"
@@ -74,7 +74,6 @@ target_link_libraries(${PROJECT_NAME}_laser_scanner PUBLIC
 
 # Example showing basic usage
 add_executable(${PROJECT_NAME}_test src/usage_example.cpp)
-target_compile_options(${PROJECT_NAME}_test PRIVATE -std=c++14)
 set_target_properties(${PROJECT_NAME}_test PROPERTIES OUTPUT_NAME depth_example PREFIX "")
 target_include_directories(${PROJECT_NAME}_test PUBLIC
     "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCEDIR}/include>"
@@ -85,7 +84,6 @@ target_link_libraries(${PROJECT_NAME}_test PUBLIC
 
 # Example showing an orbiting camera
 add_executable(${PROJECT_NAME}_orbit src/camera_orbit_example.cpp)
-target_compile_options(${PROJECT_NAME}_orbit PRIVATE -std=c++14)
 set_target_properties(${PROJECT_NAME}_orbit PROPERTIES OUTPUT_NAME orbit_example PREFIX "")
 target_include_directories(${PROJECT_NAME}_orbit PUBLIC
     "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"

diff --git a/gl_depth_sim/cmake/gl_depth_sim-config.cmake.in b/gl_depth_sim/cmake/gl_depth_sim-config.cmake.in
@@ -9,6 +9,6 @@ find_dependency(Eigen3)
 find_dependency(assimp)
 find_dependency(OpenCV)
 find_dependency(OpenGL)
-
+find_dependency(PCL)
 
 include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@-targets.cmake")