diff --git a/CMakeLists.txt b/CMakeLists.txt index 29ca64f..51f8481 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,8 @@ -cmake_minimum_required(VERSION 3.5) +# cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.0.2) + + + if (POLICY CMP0091) cmake_policy(SET CMP0091 NEW) @@ -27,7 +31,9 @@ else() endif() -project(QtADS LANGUAGES CXX VERSION ${VERSION_SHORT}) +project(qtads LANGUAGES CXX VERSION ${VERSION_SHORT}) + +# catkin_package() option(BUILD_STATIC "Build the static library" OFF) option(BUILD_EXAMPLES "Build the examples" ON) diff --git a/package.xml b/package.xml new file mode 100644 index 0000000..ef8b88a --- /dev/null +++ b/package.xml @@ -0,0 +1,23 @@ + + qtads + 0.11.0 + + Tutorial showing how to compile your own C++ program with RViz displays and features. + + Mabel Zhang + BSD + + http://ros.org/wiki/librviz_tutorial + Dave Hershberger + + catkin + + libqt5-core + libqt5-gui + libqt5-widgets + roscpp + + + + + diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 23848d9..11f0783 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -99,9 +99,9 @@ set_target_properties(${library_name} PROPERTIES VERSION ${VERSION_SHORT} EXPORT_NAME ${library_name} DEBUG_POSTFIX "d" - ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/lib" - LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/lib" - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/bin" + # ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/lib" + # LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/lib" + # RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/bin" ) if(QT_VERSION_MAJOR STREQUAL "5") set_target_properties(${library_name} PROPERTIES