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

Small fixes

release/4.3a0
Richard Roberts 2009-11-26 17:35:16 +00:00
parent 2a2e11d05d
commit dd5d65b170
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
buildtools/gt.cmake
View File

@ -41,8 +41,8 @@ function(GT_USE_BOOST)
include_directories(${Boost_INCLUDE_DIRS}) include_directories(${Boost_INCLUDE_DIRS})
link_libraries(${Boost_LIBRARIES}) link_libraries(${Boost_LIBRARIES})
endfunction(GT_USE_BOOST) endfunction(GT_USE_BOOST)
function(GT_USE_QT4 extra_components) function(GT_USE_QT4)
find_package(Qt4 COMPONENTS QtCore QtGui ${extra_components} REQUIRED) find_package(Qt4 COMPONENTS QtCore QtGui ${ARGN} REQUIRED)
include(${QT_USE_FILE}) include(${QT_USE_FILE})
link_libraries(${QT_LIBRARIES}) link_libraries(${QT_LIBRARIES})
endfunction(GT_USE_QT4) endfunction(GT_USE_QT4)
@ -63,6 +63,8 @@ endfunction(GT_USE_EASY2D)
############ ############
### Main target functions, calling one of these will replace the previous main target. ### Main target functions, calling one of these will replace the previous main target.
# Set the "excluded" sources, i.e. unit tests
# Define "common" sources when there is no main library or executable # Define "common" sources when there is no main library or executable
function(GT_MAIN_SOURCES) function(GT_MAIN_SOURCES)
set(GT_COMMON_SOURCES "") set(GT_COMMON_SOURCES "")
@ -83,14 +85,15 @@ function(GT_INSTALL_HEADERS)
endforeach(srcpat) endforeach(srcpat)
endfunction(GT_INSTALL_HEADERS) endfunction(GT_INSTALL_HEADERS)
# Define the main shared library from the given sources # Define the main shared+static library from the given sources
function(GT_MAIN_SHLIB) function(GT_MAIN_LIB)
gt_main_sources(${ARGN}) gt_main_sources(${ARGN})
set(GT_COMMON_SOURCES "${GT_COMMON_SOURCES}" PARENT_SCOPE) set(GT_COMMON_SOURCES "${GT_COMMON_SOURCES}" PARENT_SCOPE)
message(STATUS "[gt.cmake] Adding main shlib \"${PROJECT_NAME}\" with sources ${GT_COMMON_SOURCES}") message(STATUS "[gt.cmake] Adding main lib \"${PROJECT_NAME}\" with sources ${GT_COMMON_SOURCES}")
add_library(${PROJECT_NAME} SHARED ${GT_COMMON_SOURCES}) add_library(${PROJECT_NAME} SHARED ${GT_COMMON_SOURCES})
add_library(${PROJECT_NAME} STATIC ${GT_COMMON_SOURCES})
install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION "lib" ARCHIVE DESTINATION "lib") install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION "lib" ARCHIVE DESTINATION "lib")
endfunction(GT_MAIN_SHLIB) endfunction(GT_MAIN_LIB)
# Define the main static library from the given sources # Define the main static library from the given sources
function(GT_MAIN_STLIB) function(GT_MAIN_STLIB)