alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-03-15 04:57:30 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmake: Use include/lib paths from MRAA pkgconfig for cmake

Browse Source 
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
This commit is contained in:
Noel Eck 2015-12-10 13:57:55 -08:00 committed by Mihai Tudor Panu
parent 669fd317b6
commit d0504bb65b
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/building.md
View File

@ -5,12 +5,10 @@ UPM uses cmake in order to make compilation relatively painless. Cmake runs
build out of tree so the recommended way is to clone from git and make a build/ build out of tree so the recommended way is to clone from git and make a build/
directory. directory.
This project depends on libmraa, so that needs to be installed first. Use the This project depends on libmraa, so that needs to be installed first. Append
following environment variables to configure the paths: the install location of mraa pkgconfig to the following environment variable:
PKG_CONFIG_PATH=$PKG_CONFIG_PATH:.../mraa/build/lib/pkgconfig PKG_CONFIG_PATH=$PKG_CONFIG_PATH:.../mraa/build/lib/pkgconfig
CPLUS_INCLUDE_PATH=$CPLUS_INCLUDE_PATH:.../mraa/build/include
LIBRARY_PATH=$LIBRARY_PATH:.../mraa/build/lib
UPM will attempt to build all directories inside src/ and they must contain UPM will attempt to build all directories inside src/ and they must contain
individual CMakeLists.txt files. individual CMakeLists.txt files.

4
examples/c++/CMakeLists.txt
View File

@ -74,6 +74,10 @@ endmacro()
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/examples) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/examples)
# Set the mraa include and link directories prior to adding examples
include_directories (${MRAA_INCLUDE_DIRS})
link_directories (${MRAA_LIBDIR})
# If your sample source file matches the name of the module it tests, add it here # If your sample source file matches the name of the module it tests, add it here
# Exceptions are as follows: # Exceptions are as follows:
# string after first '-' is ignored (e.g. nrf24l01-transmitter maps to nrf24l01) # string after first '-' is ignored (e.g. nrf24l01-transmitter maps to nrf24l01)

15
src/CMakeLists.txt
View File

@ -49,9 +49,9 @@ macro(upm_SWIG_NODE)
) )
if (${V8_VERSION_MAJOR} GREATER 3) if (${V8_VERSION_MAJOR} GREATER 3)
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7") if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7")
message(FATAL_ERROR " **ERROR** GCC 4.7 or above is required to compile jsupm_${libname} ") message(FATAL_ERROR " **ERROR** GCC 4.7 or above is required to compile jsupm_${libname} ")
endif() endif()
endif() endif()
set_property (TARGET jsupm_${libname} PROPERTY CXX_STANDARD 11) set_property (TARGET jsupm_${libname} PROPERTY CXX_STANDARD 11)
set_property (TARGET jsupm_${libname} PROPERTY CXX_STANDARD_REQUIRED ON) set_property (TARGET jsupm_${libname} PROPERTY CXX_STANDARD_REQUIRED ON)
@ -88,10 +88,10 @@ macro(upm_SWIG_JAVA)
SUFFIX ".so" SUFFIX ".so"
) )
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/libjavaupm_${libname}.so install (FILES ${CMAKE_CURRENT_BINARY_DIR}/libjavaupm_${libname}.so
DESTINATION lib/java DESTINATION lib/java
) )
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/upm_${libname}.jar install (FILES ${CMAKE_CURRENT_BINARY_DIR}/upm_${libname}.jar
DESTINATION lib/java DESTINATION lib/java
) )
if (NOT DEFINED $ENV{JAVA_HOME_NATIVE}) if (NOT DEFINED $ENV{JAVA_HOME_NATIVE})
@ -168,15 +168,16 @@ if (SWIG_FOUND)
# if(BUILDSWIGJAVA) # if(BUILDSWIGJAVA)
# add_subdirectory (java) # add_subdirectory (java)
# endif(BUILDSWIGJAVA) # endif(BUILDSWIGJAVA)
endif() endif()
macro(upm_module_init) macro(upm_module_init)
link_directories (${MRAA_LIBDIR})
add_library (${libname} SHARED ${module_src}) add_library (${libname} SHARED ${module_src})
foreach (linkflag ${ARGN}) foreach (linkflag ${ARGN})
target_link_libraries (${libname} ${linkflag}) target_link_libraries (${libname} ${linkflag})
endforeach () endforeach ()
include_directories (${MRAA_INCLUDE_DIR} .) include_directories (${MRAA_INCLUDE_DIRS} .)
target_link_libraries (${libname} ${MRAA_LIBRARIES}) target_link_libraries (${libname} ${MRAA_LIBRARIES})
set_target_properties( set_target_properties(
${libname} ${libname}