From 80466b10fcc29ec05457d52985a265fa9d6e68b0 Mon Sep 17 00:00:00 2001 From: Stefan Laner Date: Fri, 31 Jan 2014 15:29:27 +0100 Subject: removed accidentally added cmake files --- CMakeLists.txt | 60 ----------------------------- commonapi.spec.in | 92 -------------------------------------------- src/CommonAPI/CMakeLists.txt | 36 ----------------- 3 files changed, 188 deletions(-) delete mode 100644 CMakeLists.txt delete mode 100644 commonapi.spec.in delete mode 100644 src/CommonAPI/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt deleted file mode 100644 index 53674ba..0000000 --- a/CMakeLists.txt +++ /dev/null @@ -1,60 +0,0 @@ -cmake_minimum_required (VERSION 2.8.1) - -PROJECT(libcommonapi) - -SET( ${PROJECT_NAME}_MAJOR_VERSION 2 ) -SET( ${PROJECT_NAME}_MINOR_VERSION 1 ) -SET( ${PROJECT_NAME}_PATCH_LEVEL 4 ) - -set(GENIVI_PROJECT_VERSION ${${PROJECT_NAME}_MAJOR_VERSION}.${${PROJECT_NAME}_MINOR_VERSION}.${${PROJECT_NAME}_PATCH_LEVEL}) - -set(PACKAGE_VERSION ${GENIVI_PROJECT_VERSION}) -set(GENIVI_RPM_RELEASE ${GENIVI_PROJECT_VERSION}) - -##################### RPM CONFIG ######################## -#SET( GENIVI_RPM_RELEASE "1${SVN_REVISION}" ) -SET( LICENSE "MPL2" ) -######################################################### - - -SET( prefix ${CMAKE_INSTALL_PREFIX}) -SET( libdir "\${exec_prefix}/lib" ) -SET( includedir "\${exec_prefix}/include" ) - -SET( SHMLIBDIR ${CMAKE_INSTALL_PREFIX}/lib ) -SET( SHMLIBSTATIC ${CMAKE_INSTALL_PREFIX}/lib ) -SET( SHMINCLUDEDIR ${CMAKE_INSTALL_PREFIX}/include ) - -FIND_PACKAGE(PkgConfig) -FIND_PACKAGE(Threads REQUIRED) - -############################################################################### -# is using the 'pkg-config' tool -#pkg_check_modules(DLT automotive-dlt) -############################################################################## -# general stuff - -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -DDEBUG -g -Wall -DCOMMONAPI_INTERNAL_COMPILATION") - -OPTION(BUILD_SHARED_LIBS "Set to OFF to build static libraries" ON ) -OPTION(ENABLE_BUILD_DOC "Set to ON to build Documentation" OFF) - -ADD_SUBDIRECTORY( src/CommonAPI ) - - -############################################################################## -# installing files - -INSTALL(FILES CommonAPI.pc - DESTINATION /usr/lib/pkgconfig - COMPONENT base) - - - -CONFIGURE_FILE(commonapi.spec.in commonapi.spec) -CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/CommonAPI.pc.in ${CMAKE_CURRENT_SOURCE_DIR}/CommonAPI.pc) -CONFIGURE_FILE(CommonAPI-uninstalled.pc.in CommonAPI-uninstalled.pc) -CONFIGURE_FILE(doxygen.cfg Doxygen) -#CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/src/config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/src/config.h) - - diff --git a/commonapi.spec.in b/commonapi.spec.in deleted file mode 100644 index 4956ffd..0000000 --- a/commonapi.spec.in +++ /dev/null @@ -1,92 +0,0 @@ -Name: @PROJECT_NAME@ -Version: @PACKAGE_VERSION@ -Release: @PACKAGE_VERSION@ -Summary: CommonAPI -Group: Applications/BMW -License: @LICENSE@ -Vendor: BMW Group -URL: http://www.bmw.de -Source: @PROJECT_NAME@-@GENIVI_RPM_RELEASE@.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -#Requires: - -%description -CAPI middleware for IPC - -%package dev -Summary: CommonAPI header files -#Requires: libcommonapi we have in comment as we first have to align packet names - -%description dev -CAPI middleware headers for IPC development - -%prep -%setup - -%build -mkdir -p build -cd build -#../configure --host=@HOST_TYPE@ --prefix=%{_usr} -../configure --host=@GENIVI_HOST_ARCHITECTURE@ --prefix=%{_usr} - -make - -%install -rm -rf $RPM_BUILD_ROOT -cd build -cmake .. -make install DESTDIR=$RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_bindir} - -#/usr/bin/install -c -m 755 ../src/shm-daemon $RPM_BUILD_ROOT%{_bindir} -#/usr/bin/install -c -m 755 ../Config/shm.conf $RPM_BUILD_ROOT%{_sysconfdir} -#/usr/bin/install -c -m 755 ../CommonAPI.pc $RPM_BUILD_ROOT/usr/lib/pkgconfig - - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -%defattr(-,root,root,-) -%{_libdir}/libCommonAPI.so.3 -%{_libdir}/libCommonAPI.so.3.0.0 -%{_libdir}/libCommonAPI.so - - -%files dev -%defattr(-,root,root,-) -%{_libdir}/pkgconfig/CommonAPI.pc -%{_libdir}/libCommonAPI.so -#%{_libdir}/libCommonAPI.la -%{_includedir}/CommonAPI-@PACKAGE_VERSION@/CommonAPI/Attribute.h -%{_includedir}/CommonAPI-@PACKAGE_VERSION@/CommonAPI/AttributeExtension.h -%{_includedir}/CommonAPI-@PACKAGE_VERSION@/CommonAPI/ByteBuffer.h -%{_includedir}/CommonAPI-@PACKAGE_VERSION@/CommonAPI/CommonAPI.h -%{_includedir}/CommonAPI-@PACKAGE_VERSION@/CommonAPI/Configuration.h -%{_includedir}/CommonAPI-@PACKAGE_VERSION@/CommonAPI/ContainerUtils.h -%{_includedir}/CommonAPI-@PACKAGE_VERSION@/CommonAPI/Event.h -%{_includedir}/CommonAPI-@PACKAGE_VERSION@/CommonAPI/Factory.h -%{_includedir}/CommonAPI-@PACKAGE_VERSION@/CommonAPI/Factory.hpp -%{_includedir}/CommonAPI-@PACKAGE_VERSION@/CommonAPI/InputStream.h -%{_includedir}/CommonAPI-@PACKAGE_VERSION@/CommonAPI/MainLoopContext.h -%{_includedir}/CommonAPI-@PACKAGE_VERSION@/CommonAPI/MiddlewareInfo.h -%{_includedir}/CommonAPI-@PACKAGE_VERSION@/CommonAPI/OutputStream.h -%{_includedir}/CommonAPI-@PACKAGE_VERSION@/CommonAPI/Proxy.h -%{_includedir}/CommonAPI-@PACKAGE_VERSION@/CommonAPI/ProxyManager.h -%{_includedir}/CommonAPI-@PACKAGE_VERSION@/CommonAPI/Runtime.h -%{_includedir}/CommonAPI-@PACKAGE_VERSION@/CommonAPI/SelectiveEvent.h -%{_includedir}/CommonAPI-@PACKAGE_VERSION@/CommonAPI/SerializableStruct.h -%{_includedir}/CommonAPI-@PACKAGE_VERSION@/CommonAPI/SerializableVariant.h -%{_includedir}/CommonAPI-@PACKAGE_VERSION@/CommonAPI/SerializableVariant.hpp -%{_includedir}/CommonAPI-@PACKAGE_VERSION@/CommonAPI/ServicePublisher.h -%{_includedir}/CommonAPI-@PACKAGE_VERSION@/CommonAPI/ServicePublisher.hpp -%{_includedir}/CommonAPI-@PACKAGE_VERSION@/CommonAPI/Stub.h -%{_includedir}/CommonAPI-@PACKAGE_VERSION@/CommonAPI/types.h -%{_includedir}/CommonAPI-@PACKAGE_VERSION@/CommonAPI/utils.h - -%changelog -* Wed Jan 29 2014 Gernot Wirschal @GENIVI_PROJECT_VERSION@ -- Add dev packet configuration -* Mon Jan 27 2014 Gernot Wirschal @GENIVI_PROJECT_VERSION@ -- Initial packaging for GPT - diff --git a/src/CommonAPI/CMakeLists.txt b/src/CommonAPI/CMakeLists.txt deleted file mode 100644 index e397d6b..0000000 --- a/src/CommonAPI/CMakeLists.txt +++ /dev/null @@ -1,36 +0,0 @@ -cmake_minimum_required (VERSION 2.8.1) -FIND_PACKAGE(PkgConfig) -set(CAPI_LIB_SRCS Runtime.cpp Configuration.cpp ServicePublisher.cpp ContainerUtils.cpp ) -add_library(CommonAPI ${CAPI_LIB_SRCS}) -set_target_properties(CommonAPI PROPERTIES VERSION 3.0.0 SOVERSION 3 LINKER_LANGUAGE C) - -install(TARGETS CommonAPI LIBRARY DESTINATION /usr/lib ARCHIVE DESTINATION lib/static COMPONENT base) - -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Factory.h DESTINATION /usr/include/CommonAPI-${PACKAGE_VERSION}/CommonAPI) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Attribute.h DESTINATION /usr/include/CommonAPI-${PACKAGE_VERSION}/CommonAPI) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/AttributeExtension.h DESTINATION /usr/include/CommonAPI-${PACKAGE_VERSION}/CommonAPI) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/CommonAPI.h DESTINATION /usr/include/CommonAPI-${PACKAGE_VERSION}/CommonAPI) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/ByteBuffer.h DESTINATION /usr/include/CommonAPI-${PACKAGE_VERSION}/CommonAPI) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Configuration.h DESTINATION /usr/include/CommonAPI-${PACKAGE_VERSION}/CommonAPI) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/ContainerUtils.h DESTINATION /usr/include/CommonAPI-${PACKAGE_VERSION}/CommonAPI) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Event.h DESTINATION /usr/include/CommonAPI-${PACKAGE_VERSION}/CommonAPI) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Factory.h DESTINATION /usr/include/CommonAPI-${PACKAGE_VERSION}/CommonAPI) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Factory.hpp DESTINATION /usr/include/CommonAPI-${PACKAGE_VERSION}/CommonAPI) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/InputStream.h DESTINATION /usr/include/CommonAPI-${PACKAGE_VERSION}/CommonAPI) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/MainLoopContext.h DESTINATION /usr/include/CommonAPI-${PACKAGE_VERSION}/CommonAPI) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/OutputStream.h DESTINATION /usr/include/CommonAPI-${PACKAGE_VERSION}/CommonAPI) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/MiddlewareInfo.h DESTINATION /usr/include/CommonAPI-${PACKAGE_VERSION}/CommonAPI) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Proxy.h DESTINATION /usr/include/CommonAPI-${PACKAGE_VERSION}/CommonAPI) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/ProxyManager.h DESTINATION /usr/include/CommonAPI-${PACKAGE_VERSION}/CommonAPI) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Runtime.h DESTINATION /usr/include/CommonAPI-${PACKAGE_VERSION}/CommonAPI) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/SelectiveEvent.h DESTINATION /usr/include/CommonAPI-${PACKAGE_VERSION}/CommonAPI) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/SerializableStruct.h DESTINATION /usr/include/CommonAPI-${PACKAGE_VERSION}/CommonAPI) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/SerializableVariant.h DESTINATION /usr/include/CommonAPI-${PACKAGE_VERSION}/CommonAPI) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/SerializableVariant.hpp DESTINATION /usr/include/CommonAPI-${PACKAGE_VERSION}/CommonAPI) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/ServicePublisher.h DESTINATION /usr/include/CommonAPI-${PACKAGE_VERSION}/CommonAPI) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/ServicePublisher.hpp DESTINATION /usr/include/CommonAPI-${PACKAGE_VERSION}/CommonAPI) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Stub.h DESTINATION /usr/include/CommonAPI-${PACKAGE_VERSION}/CommonAPI) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/types.h DESTINATION /usr/include/CommonAPI-${PACKAGE_VERSION}/CommonAPI) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/utils.h DESTINATION /usr/include/CommonAPI-${PACKAGE_VERSION}/CommonAPI) - - -- cgit v1.2.1