GitLab version (branch QNX_7.1_v4.1.1)
							parent
							
								
									69a3a75195
								
							
						
					
					
						commit
						ba522a8859
					
				|  | @ -185,7 +185,7 @@ if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang") | ||||||
|     endif() |     endif() | ||||||
| endif() | endif() | ||||||
| 
 | 
 | ||||||
| if (NOT MSVC) | if ((NOT MSVC) AND (NOT QNX)) | ||||||
|   option(GTSAM_BUILD_WITH_MARCH_NATIVE  "Enable/Disable building with all instructions supported by native architecture (binary may not be portable!)" ON) |   option(GTSAM_BUILD_WITH_MARCH_NATIVE  "Enable/Disable building with all instructions supported by native architecture (binary may not be portable!)" ON) | ||||||
|   if(GTSAM_BUILD_WITH_MARCH_NATIVE) |   if(GTSAM_BUILD_WITH_MARCH_NATIVE) | ||||||
|     # Add as public flag so all dependant projects also use it, as required |     # Add as public flag so all dependant projects also use it, as required | ||||||
|  |  | ||||||
|  | @ -22,7 +22,7 @@ if(GTSAM_UNSTABLE_AVAILABLE) | ||||||
|     print_enabled_config(${GTSAM_UNSTABLE_INSTALL_MATLAB_TOOLBOX} "Build MATLAB Toolbox for unstable") |     print_enabled_config(${GTSAM_UNSTABLE_INSTALL_MATLAB_TOOLBOX} "Build MATLAB Toolbox for unstable") | ||||||
| endif() | endif() | ||||||
| 
 | 
 | ||||||
| if(NOT MSVC AND NOT XCODE_VERSION) | if(NOT MSVC AND NOT XCODE_VERSION AND NOT QNX) | ||||||
|     print_enabled_config(${GTSAM_BUILD_WITH_MARCH_NATIVE}     "Build for native architecture  ") |     print_enabled_config(${GTSAM_BUILD_WITH_MARCH_NATIVE}     "Build for native architecture  ") | ||||||
|     print_config("Build type" "${CMAKE_BUILD_TYPE}") |     print_config("Build type" "${CMAKE_BUILD_TYPE}") | ||||||
|     print_config("C compilation flags" "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE_UPPER}}") |     print_config("C compilation flags" "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE_UPPER}}") | ||||||
|  |  | ||||||
|  | @ -1,2 +1,6 @@ | ||||||
| file(GLOB ceres_headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h") | file(GLOB ceres_headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h") | ||||||
| install(FILES ${ceres_headers} DESTINATION include/gtsam/3rdparty/ceres) | if(QNX) | ||||||
|  |     install(FILES ${ceres_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gtsam/3rdparty/ceres) | ||||||
|  | else() | ||||||
|  |     install(FILES ${ceres_headers} DESTINATION include/gtsam/3rdparty/ceres) | ||||||
|  | endif() | ||||||
|  | @ -1 +1,5 @@ | ||||||
| install(FILES metis.h DESTINATION include/gtsam/3rdparty/metis) | if(QNX) | ||||||
|  |     install(FILES metis.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gtsam/3rdparty/metis) | ||||||
|  | else() | ||||||
|  |     install(FILES metis.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gtsam/3rdparty/metis) | ||||||
|  | endif() | ||||||
|  | @ -1,12 +1,24 @@ | ||||||
| # Install headers | # Install headers | ||||||
| file(GLOB base_headers "*.h") | file(GLOB base_headers "*.h") | ||||||
| install(FILES ${base_headers} DESTINATION include/gtsam/base) | if(QNX) | ||||||
|  |     install(FILES ${base_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gtsam/base) | ||||||
|  | else() | ||||||
|  |     install(FILES ${base_headers} DESTINATION include/gtsam/base) | ||||||
|  | endif() | ||||||
| 
 | 
 | ||||||
| file(GLOB base_headers_tree "treeTraversal/*.h") | file(GLOB base_headers_tree "treeTraversal/*.h") | ||||||
| install(FILES ${base_headers_tree} DESTINATION include/gtsam/base/treeTraversal) | if(QNX) | ||||||
|  |     install(FILES ${base_headers_tree} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gtsam/base/treeTraversal) | ||||||
|  | else() | ||||||
|  |     install(FILES ${base_headers_tree} DESTINATION include/gtsam/base/treeTraversal) | ||||||
|  | endif() | ||||||
| 
 | 
 | ||||||
| file(GLOB deprecated_headers "deprecated/*.h") | file(GLOB deprecated_headers "deprecated/*.h") | ||||||
| install(FILES ${deprecated_headers} DESTINATION include/gtsam/base/deprecated) | if(QNX) | ||||||
|  |     install(FILES ${deprecated_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gtsam/base/deprecated) | ||||||
|  | else() | ||||||
|  |     install(FILES ${deprecated_headers} DESTINATION include/gtsam/base/deprecated) | ||||||
|  | endif() | ||||||
| 
 | 
 | ||||||
| # Build tests | # Build tests | ||||||
| add_subdirectory(tests) | add_subdirectory(tests) | ||||||
|  |  | ||||||
|  | @ -1,6 +1,10 @@ | ||||||
| # Install headers | # Install headers | ||||||
| file(GLOB basis_headers "*.h") | file(GLOB basis_headers "*.h") | ||||||
| install(FILES ${basis_headers} DESTINATION include/gtsam/basis) | if(QNX) | ||||||
|  |     install(FILES ${basis_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gtsam/basis) | ||||||
|  | else() | ||||||
|  |     install(FILES ${basis_headers} DESTINATION include/gtsam/basis) | ||||||
|  | endif() | ||||||
| 
 | 
 | ||||||
| # Build tests | # Build tests | ||||||
| add_subdirectory(tests) | add_subdirectory(tests) | ||||||
|  |  | ||||||
|  | @ -2,7 +2,11 @@ | ||||||
| set(subdir discrete) | set(subdir discrete) | ||||||
| file(GLOB discrete_headers "*.h") | file(GLOB discrete_headers "*.h") | ||||||
| # FIXME: exclude headers | # FIXME: exclude headers | ||||||
| install(FILES ${discrete_headers} DESTINATION include/gtsam/discrete) | if(QNX) | ||||||
|  |     install(FILES ${discrete_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gtsam/discrete) | ||||||
|  | else() | ||||||
|  |     install(FILES ${discrete_headers} DESTINATION include/gtsam/discrete) | ||||||
|  | endif() | ||||||
| 
 | 
 | ||||||
| # Add all tests | # Add all tests | ||||||
| add_subdirectory(tests) | add_subdirectory(tests) | ||||||
|  |  | ||||||
|  | @ -1,6 +1,10 @@ | ||||||
| # Install headers | # Install headers | ||||||
| file(GLOB geometry_headers "*.h") | file(GLOB geometry_headers "*.h") | ||||||
| install(FILES ${geometry_headers} DESTINATION include/gtsam/geometry) | if(QNX) | ||||||
|  |     install(FILES ${geometry_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gtsam/geometry) | ||||||
|  | else() | ||||||
|  |     install(FILES ${geometry_headers} DESTINATION include/gtsam/geometry) | ||||||
|  | endif() | ||||||
| 
 | 
 | ||||||
| # Build tests | # Build tests | ||||||
| add_subdirectory(tests) | add_subdirectory(tests) | ||||||
|  |  | ||||||
|  | @ -1,6 +1,10 @@ | ||||||
| # Install headers | # Install headers | ||||||
| file(GLOB inference_headers "*.h") | file(GLOB inference_headers "*.h") | ||||||
| install(FILES ${inference_headers} DESTINATION include/gtsam/inference) | if(QNX) | ||||||
|  |     install(FILES ${inference_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gtsam/inference) | ||||||
|  | else() | ||||||
|  |     install(FILES ${inference_headers} DESTINATION include/gtsam/inference) | ||||||
|  | endif() | ||||||
| 
 | 
 | ||||||
| # Build tests | # Build tests | ||||||
| add_subdirectory(tests) | add_subdirectory(tests) | ||||||
|  |  | ||||||
|  | @ -1,6 +1,10 @@ | ||||||
| # Install headers | # Install headers | ||||||
| file(GLOB linear_headers "*.h") | file(GLOB linear_headers "*.h") | ||||||
| install(FILES ${linear_headers} DESTINATION include/gtsam/linear) | if(QNX) | ||||||
|  |     install(FILES ${linear_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gtsam/linear) | ||||||
|  | else() | ||||||
|  |     install(FILES ${linear_headers} DESTINATION include/gtsam/linear) | ||||||
|  | endif() | ||||||
| 
 | 
 | ||||||
| # Build tests | # Build tests | ||||||
| add_subdirectory(tests) | add_subdirectory(tests) | ||||||
|  |  | ||||||
|  | @ -1,6 +1,10 @@ | ||||||
| # Install headers | # Install headers | ||||||
| file(GLOB navigation_headers "*.h") | file(GLOB navigation_headers "*.h") | ||||||
| install(FILES ${navigation_headers} DESTINATION include/gtsam/navigation) | if(QNX) | ||||||
|  |     install(FILES ${navigation_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gtsam/navigation) | ||||||
|  | else() | ||||||
|  |     install(FILES ${navigation_headers} DESTINATION include/gtsam/navigation) | ||||||
|  | endif() | ||||||
| 
 | 
 | ||||||
| # Add all tests | # Add all tests | ||||||
| add_subdirectory(tests) | add_subdirectory(tests) | ||||||
|  |  | ||||||
|  | @ -1,9 +1,16 @@ | ||||||
| # Install headers | # Install headers | ||||||
| file(GLOB nonlinear_headers "*.h") | file(GLOB nonlinear_headers "*.h") | ||||||
| install(FILES ${nonlinear_headers} DESTINATION include/gtsam/nonlinear) | if(QNX) | ||||||
|  |     install(FILES ${nonlinear_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gtsam/nonlinear) | ||||||
|  | else() | ||||||
|  |     install(FILES ${nonlinear_headers} DESTINATION include/gtsam/nonlinear) | ||||||
|  | endif() | ||||||
| 
 | 
 | ||||||
| file(GLOB nonlinear_headers_internal "internal/*.h") | file(GLOB nonlinear_headers_internal "internal/*.h") | ||||||
| install(FILES ${nonlinear_headers_internal} DESTINATION include/gtsam/nonlinear/internal) | if(QNX) | ||||||
| 
 |     install(FILES ${nonlinear_headers_internal} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gtsam/nonlinear/internal) | ||||||
|  | else() | ||||||
|  |     install(FILES ${nonlinear_headers_internal} DESTINATION include/gtsam/nonlinear/internal) | ||||||
|  | endif() | ||||||
| # Build tests | # Build tests | ||||||
| add_subdirectory(tests) | add_subdirectory(tests) | ||||||
|  |  | ||||||
|  | @ -1,6 +1,10 @@ | ||||||
| # Install headers | # Install headers | ||||||
| file(GLOB sam_headers "*.h") | file(GLOB sam_headers "*.h") | ||||||
| install(FILES ${sam_headers} DESTINATION include/gtsam/sam) | if(QNX) | ||||||
|  |     install(FILES ${sam_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gtsam/sam) | ||||||
|  | else() | ||||||
|  |     install(FILES ${sam_headers} DESTINATION include/gtsam/sam) | ||||||
|  | endif() | ||||||
| 
 | 
 | ||||||
| # Build tests | # Build tests | ||||||
| add_subdirectory(tests) | add_subdirectory(tests) | ||||||
|  |  | ||||||
|  | @ -1,6 +1,10 @@ | ||||||
| # Install headers | # Install headers | ||||||
| file(GLOB sfm_headers "*.h") | file(GLOB sfm_headers "*.h") | ||||||
| install(FILES ${sfm_headers} DESTINATION include/gtsam/sfm) | if(QNX) | ||||||
|  |     install(FILES ${sfm_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gtsam/sfm) | ||||||
|  | else() | ||||||
|  |     install(FILES ${sfm_headers} DESTINATION include/gtsam/sfm) | ||||||
|  | endif() | ||||||
| 
 | 
 | ||||||
| # Build tests | # Build tests | ||||||
| add_subdirectory(tests) | add_subdirectory(tests) | ||||||
|  |  | ||||||
|  | @ -4,7 +4,11 @@ set (slam_excluded_headers #"") | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| file(GLOB slam_headers "*.h") | file(GLOB slam_headers "*.h") | ||||||
| install(FILES ${slam_headers} DESTINATION include/gtsam/slam) | if(QNX) | ||||||
|  |     install(FILES ${slam_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gtsam/slam) | ||||||
|  | else() | ||||||
|  |     install(FILES ${slam_headers} DESTINATION include/gtsam/slam) | ||||||
|  | endif() | ||||||
| 
 | 
 | ||||||
| # Build tests | # Build tests | ||||||
| add_subdirectory(tests) | add_subdirectory(tests) | ||||||
|  |  | ||||||
|  | @ -1,6 +1,10 @@ | ||||||
| # Install headers | # Install headers | ||||||
| file(GLOB symbolic_headers "*.h") | file(GLOB symbolic_headers "*.h") | ||||||
| install(FILES ${symbolic_headers} DESTINATION include/gtsam/symbolic) | if(QNX) | ||||||
|  |     install(FILES ${symbolic_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gtsam/symbolic) | ||||||
|  | else() | ||||||
|  |     install(FILES ${symbolic_headers} DESTINATION include/gtsam/symbolic) | ||||||
|  | endif() | ||||||
| 
 | 
 | ||||||
| # Build tests | # Build tests | ||||||
| add_subdirectory(tests) | add_subdirectory(tests) | ||||||
|  |  | ||||||
|  | @ -1,6 +1,10 @@ | ||||||
| # Install headers | # Install headers | ||||||
| file(GLOB base_headers "*.h") | file(GLOB base_headers "*.h") | ||||||
| install(FILES ${base_headers} DESTINATION include/gtsam_unstable/base) | if(QNX) | ||||||
|  |     install(FILES ${base_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gtsam_unstable/base) | ||||||
|  | else() | ||||||
|  |     install(FILES ${base_headers} DESTINATION include/gtsam_unstable/base) | ||||||
|  | endif() | ||||||
| 
 | 
 | ||||||
| # Add all tests | # Add all tests | ||||||
| add_subdirectory(tests) | add_subdirectory(tests) | ||||||
|  |  | ||||||
|  | @ -1,6 +1,10 @@ | ||||||
| # Install headers | # Install headers | ||||||
| file(GLOB discrete_headers "*.h") | file(GLOB discrete_headers "*.h") | ||||||
| install(FILES ${discrete_headers} DESTINATION include/gtsam_unstable/discrete) | if(QNX) | ||||||
|  |     install(FILES ${discrete_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gtsam_unstable/discrete) | ||||||
|  | else() | ||||||
|  |     install(FILES ${discrete_headers} DESTINATION include/gtsam_unstable/discrete) | ||||||
|  | endif() | ||||||
| 
 | 
 | ||||||
| # Add all tests | # Add all tests | ||||||
| add_subdirectory(tests) | add_subdirectory(tests) | ||||||
|  |  | ||||||
|  | @ -1,6 +1,10 @@ | ||||||
| # Install headers | # Install headers | ||||||
| file(GLOB dynamics_headers "*.h") | file(GLOB dynamics_headers "*.h") | ||||||
| install(FILES ${dynamics_headers} DESTINATION include/gtsam_unstable/dynamics) | if(QNX) | ||||||
|  |     install(FILES ${dynamics_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gtsam_unstable/dynamics) | ||||||
|  | else() | ||||||
|  |     install(FILES ${dynamics_headers} DESTINATION include/gtsam_unstable/dynamics) | ||||||
|  | endif() | ||||||
| 
 | 
 | ||||||
| # Add all tests | # Add all tests | ||||||
| add_subdirectory(tests) | add_subdirectory(tests) | ||||||
|  |  | ||||||
|  | @ -1,6 +1,10 @@ | ||||||
| # Install headers | # Install headers | ||||||
| file(GLOB geometry_headers "*.h") | file(GLOB geometry_headers "*.h") | ||||||
| install(FILES ${geometry_headers} DESTINATION include/gtsam_unstable/geometry) | if(QNX) | ||||||
|  |     install(FILES ${geometry_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gtsam_unstable/geometry) | ||||||
|  | else() | ||||||
|  |     install(FILES ${geometry_headers} DESTINATION include/gtsam_unstable/geometry) | ||||||
|  | endif() | ||||||
| 
 | 
 | ||||||
| # Add all tests | # Add all tests | ||||||
| add_subdirectory(tests) | add_subdirectory(tests) | ||||||
|  |  | ||||||
|  | @ -1,6 +1,10 @@ | ||||||
| # Install headers | # Install headers | ||||||
| file(GLOB linear_headers "*.h") | file(GLOB linear_headers "*.h") | ||||||
| install(FILES ${linear_headers} DESTINATION include/gtsam_unstable/linear) | if(QNX) | ||||||
|  |     install(FILES ${linear_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gtsam_unstable/linear) | ||||||
|  | else() | ||||||
|  |     install(FILES ${linear_headers} DESTINATION include/gtsam_unstable/linear) | ||||||
|  | endif() | ||||||
| 
 | 
 | ||||||
| # Add all tests | # Add all tests | ||||||
| add_subdirectory(tests) | add_subdirectory(tests) | ||||||
|  |  | ||||||
|  | @ -1,6 +1,10 @@ | ||||||
| # Install headers | # Install headers | ||||||
| file(GLOB nonlinear_headers "*.h") | file(GLOB nonlinear_headers "*.h") | ||||||
| install(FILES ${nonlinear_headers} DESTINATION include/gtsam_unstable/nonlinear) | if(QNX) | ||||||
|  |     install(FILES ${nonlinear_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gtsam_unstable/nonlinear) | ||||||
|  | else() | ||||||
|  |     install(FILES ${nonlinear_headers} DESTINATION include/gtsam_unstable/nonlinear) | ||||||
|  | endif() | ||||||
| 
 | 
 | ||||||
| # Add all tests | # Add all tests | ||||||
| add_subdirectory(tests) | add_subdirectory(tests) | ||||||
|  |  | ||||||
|  | @ -1,5 +1,9 @@ | ||||||
| # Install headers | # Install headers | ||||||
| file(GLOB partition_headers "*.h") | file(GLOB partition_headers "*.h") | ||||||
| install(FILES ${partition_headers} DESTINATION include/gtsam_unstable/partition) | if(QNX) | ||||||
|  |     install(FILES ${partition_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gtsam_unstable/partition) | ||||||
|  | else() | ||||||
|  |     install(FILES ${partition_headers} DESTINATION include/gtsam_unstable/partition) | ||||||
|  | endif() | ||||||
| 
 | 
 | ||||||
| add_subdirectory(tests) | add_subdirectory(tests) | ||||||
|  |  | ||||||
|  | @ -5,7 +5,11 @@ set (slam_excluded_headers #"") | ||||||
| 
 | 
 | ||||||
| file(GLOB slam_headers "*.h") | file(GLOB slam_headers "*.h") | ||||||
| list(REMOVE_ITEM slam_headers ${slam_excluded_headers}) | list(REMOVE_ITEM slam_headers ${slam_excluded_headers}) | ||||||
| install(FILES ${slam_headers} DESTINATION include/gtsam_unstable/slam) | if(QNX) | ||||||
|  |     install(FILES ${slam_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gtsam_unstable/slam) | ||||||
|  | else() | ||||||
|  |     install(FILES ${slam_headers} DESTINATION include/gtsam_unstable/slam) | ||||||
|  | endif() | ||||||
| 
 | 
 | ||||||
| # Add all tests | # Add all tests | ||||||
| add_subdirectory(tests) | add_subdirectory(tests) | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue