12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed problem with building convenience libraries with empty source files

release/4.3a0
Alex Cunningham 2013-04-10 15:47:01 +00:00
parent dce575cb73
commit 9b2a74bbaf
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtsam/CMakeLists.txt
View File

@ -47,13 +47,13 @@ endif()
# assemble core libaries # assemble core libaries
foreach(subdir ${gtsam_subdirs}) foreach(subdir ${gtsam_subdirs})
# Build convenience libraries # Build convenience libraries
file(GLOB subdir_srcs "${subdir}/*.cpp") file(GLOB subdir_cpp_srcs "${subdir}/*.cpp")
file(GLOB subdir_headers "${subdir}/*.h") file(GLOB subdir_headers "${subdir}/*.h")
set(subdir_srcs ${subdir_srcs} ${subdir_headers}) # Include header files so they show up in Visual Studio set(subdir_srcs ${subdir_cpp_srcs} ${subdir_headers}) # Include header files so they show up in Visual Studio
gtsam_assign_source_folders("${subdir_srcs}") # Create MSVC structure gtsam_assign_source_folders("${subdir_srcs}") # Create MSVC structure
list(REMOVE_ITEM subdir_srcs ${excluded_sources}) list(REMOVE_ITEM subdir_srcs ${excluded_sources})
set(${subdir}_srcs ${subdir_srcs}) set(${subdir}_srcs ${subdir_srcs})
if (GTSAM_BUILD_CONVENIENCE_LIBRARIES) if (GTSAM_BUILD_CONVENIENCE_LIBRARIES AND (subdir_cpp_srcs)) # Only build convenience library if sources exist
message(STATUS "Building Convenience Library: ${subdir}") message(STATUS "Building Convenience Library: ${subdir}")
add_library(${subdir} STATIC ${subdir_srcs}) add_library(${subdir} STATIC ${subdir_srcs})
endif() endif()
@ -63,6 +63,8 @@ foreach(subdir ${gtsam_subdirs})
add_subdirectory(${subdir}) add_subdirectory(${subdir})
endforeach(subdir) endforeach(subdir)
message(STATUS "navigation_srcs: [${navigation_srcs}]")
# To add additional sources to gtsam when building the full library (static or shared) # To add additional sources to gtsam when building the full library (static or shared)
# Add the subfolder with _srcs appended to the end to this list # Add the subfolder with _srcs appended to the end to this list
set(gtsam_srcs set(gtsam_srcs