From e8d05c9b9b0e2ea777157eeaca8ee66df6aaea2d Mon Sep 17 00:00:00 2001 From: Elliot Briggs Date: Wed, 25 Feb 2015 20:27:46 +0000 Subject: [PATCH 1/2] adding install rules to CMakeLists.txt for Linux platforms --- CMakeLists.txt | 59 ++++++++++++++++++++++++++++++++++ cmake/cmake_uninstall.cmake.in | 32 ++++++++++++++++++ modules/CMakeLists.txt | 3 ++ ne10.pc.in | 13 ++++++++ 4 files changed, 107 insertions(+) create mode 100644 cmake/cmake_uninstall.cmake.in create mode 100644 ne10.pc.in diff --git a/CMakeLists.txt b/CMakeLists.txt index fc2a5e3b..749d3710 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -183,3 +183,62 @@ endif() if(IOS_PLATFORM AND IOS_DEMO) add_subdirectory(ios) endif() + +if(GNULINUX_PLATFORM) + # package config + set(prefix ${CMAKE_INSTALL_PREFIX}) + set(exec_prefix "\${prefix}") + set(libdir "\${exec_prefix}/lib${LIB_SUFFIX}") + set(includedir "\${prefix}/include") + + configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/ne10.pc.in + ${CMAKE_CURRENT_BINARY_DIR}/ne10.pc + @ONLY) + + install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/ne10.pc + DESTINATION lib${LIB_SUFFIX}/pkgconfig) + + # install rules + install( DIRECTORY inc/ + DESTINATION include/ne10 + FILES_MATCHING PATTERN "*.h") + install( DIRECTORY common/ + DESTINATION include/ne10 + FILES_MATCHING PATTERN "*.h") + + if(NE10_ENABLE_DSP) + install( DIRECTORY modules/dsp/ + DESTINATION include/ne10/dsp + FILES_MATCHING PATTERN "*.h") + endif() + + if(NE10_ENABLE_MATH) + install( DIRECTORY modules/math/ + DESTINATION include/ne10/math + FILES_MATCHING PATTERN "*.h") + endif() + + if(NE10_ENABLE_IMGPROC) + install( DIRECTORY modules/imgproc/ + DESTINATION include/ne10/imgproc + FILES_MATCHING PATTERN "*.h") + endif() + + if(NE10_ENABLE_PHYSICS) + install( DIRECTORY modules/physics/ + DESTINATION include/ne10/physics + FILES_MATCHING PATTERN "*.h") + endif() + # uninstall rules + configure_file( + ${CMAKE_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake + @ONLY) + + add_custom_target(uninstall + ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake + ) +endif() + diff --git a/cmake/cmake_uninstall.cmake.in b/cmake/cmake_uninstall.cmake.in new file mode 100644 index 00000000..9ae1ae4b --- /dev/null +++ b/cmake/cmake_uninstall.cmake.in @@ -0,0 +1,32 @@ +# http://www.vtk.org/Wiki/CMake_FAQ#Can_I_do_.22make_uninstall.22_with_CMake.3F + +IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt") + MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"") +ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt") + +FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files) +STRING(REGEX REPLACE "\n" ";" files "${files}") +FOREACH(file ${files}) + MESSAGE(STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"") + IF(EXISTS "$ENV{DESTDIR}${file}") + EXEC_PROGRAM( + "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\"" + OUTPUT_VARIABLE rm_out + RETURN_VALUE rm_retval + ) + IF(NOT "${rm_retval}" STREQUAL 0) + MESSAGE(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"") + ENDIF(NOT "${rm_retval}" STREQUAL 0) + ELSEIF(IS_SYMLINK "$ENV{DESTDIR}${file}") + EXEC_PROGRAM( + "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\"" + OUTPUT_VARIABLE rm_out + RETURN_VALUE rm_retval + ) + IF(NOT "${rm_retval}" STREQUAL 0) + MESSAGE(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"") + ENDIF(NOT "${rm_retval}" STREQUAL 0) + ELSE(EXISTS "$ENV{DESTDIR}${file}") + MESSAGE(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.") + ENDIF(EXISTS "$ENV{DESTDIR}${file}") +ENDFOREACH(file) diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt index 7398ab74..de2c3ba1 100644 --- a/modules/CMakeLists.txt +++ b/modules/CMakeLists.txt @@ -387,6 +387,8 @@ if(NE10_BUILD_STATIC OR ANDROID_PLATFORM OR IOS_DEMO) install(TARGETS NE10 DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../ios/NE10Demo/libs/) endif(IOS_DEMO) + + install(TARGETS NE10 DESTINATION lib) endif() if(NE10_BUILD_SHARED) @@ -422,4 +424,5 @@ if(NE10_BUILD_SHARED) target_link_libraries(NE10_test m) + install(TARGETS NE10_shared DESTINATION lib) endif() diff --git a/ne10.pc.in b/ne10.pc.in new file mode 100644 index 00000000..6c22e486 --- /dev/null +++ b/ne10.pc.in @@ -0,0 +1,13 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ +LV_CXXFLAGS=@LV_CXXFLAGS@ + + +Name: ne10 +Description: Ne10: An open optimized software library project for the ARM® Architecture +Requires: +Version: @LIBVER@ +Libs: -L${libdir} -lne10 +Cflags: -I${includedir} ${LV_CXXFLAGS} From 306b8140fbf682572d8f80ad468cad6215879254 Mon Sep 17 00:00:00 2001 From: Iztok Jeras Date: Thu, 15 Sep 2016 11:59:54 +0000 Subject: [PATCH 2/2] Linux install: whitespace changes --- CMakeLists.txt | 111 ++++++++++++++++----------------- cmake/cmake_uninstall.cmake.in | 46 +++++++------- 2 files changed, 78 insertions(+), 79 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 749d3710..681ec041 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -185,60 +185,59 @@ if(IOS_PLATFORM AND IOS_DEMO) endif() if(GNULINUX_PLATFORM) - # package config - set(prefix ${CMAKE_INSTALL_PREFIX}) - set(exec_prefix "\${prefix}") - set(libdir "\${exec_prefix}/lib${LIB_SUFFIX}") - set(includedir "\${prefix}/include") - - configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/ne10.pc.in - ${CMAKE_CURRENT_BINARY_DIR}/ne10.pc - @ONLY) - - install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/ne10.pc - DESTINATION lib${LIB_SUFFIX}/pkgconfig) - - # install rules - install( DIRECTORY inc/ - DESTINATION include/ne10 - FILES_MATCHING PATTERN "*.h") - install( DIRECTORY common/ - DESTINATION include/ne10 - FILES_MATCHING PATTERN "*.h") - - if(NE10_ENABLE_DSP) - install( DIRECTORY modules/dsp/ - DESTINATION include/ne10/dsp - FILES_MATCHING PATTERN "*.h") - endif() - - if(NE10_ENABLE_MATH) - install( DIRECTORY modules/math/ - DESTINATION include/ne10/math - FILES_MATCHING PATTERN "*.h") - endif() - - if(NE10_ENABLE_IMGPROC) - install( DIRECTORY modules/imgproc/ - DESTINATION include/ne10/imgproc - FILES_MATCHING PATTERN "*.h") - endif() - - if(NE10_ENABLE_PHYSICS) - install( DIRECTORY modules/physics/ - DESTINATION include/ne10/physics - FILES_MATCHING PATTERN "*.h") - endif() - # uninstall rules - configure_file( - ${CMAKE_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake - @ONLY) - - add_custom_target(uninstall - ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake - ) -endif() + # package config + set(prefix ${CMAKE_INSTALL_PREFIX}) + set(exec_prefix "\${prefix}") + set(libdir "\${exec_prefix}/lib${LIB_SUFFIX}") + set(includedir "\${prefix}/include") + + configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/ne10.pc.in + ${CMAKE_CURRENT_BINARY_DIR}/ne10.pc + @ONLY) + + install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/ne10.pc + DESTINATION lib${LIB_SUFFIX}/pkgconfig) + + # install rules + install(DIRECTORY inc/ + DESTINATION include/ne10 + FILES_MATCHING PATTERN "*.h") + install(DIRECTORY common/ + DESTINATION include/ne10 + FILES_MATCHING PATTERN "*.h") + + if(NE10_ENABLE_DSP) + install(DIRECTORY modules/dsp/ + DESTINATION include/ne10/dsp + FILES_MATCHING PATTERN "*.h") + endif() + + if(NE10_ENABLE_MATH) + install(DIRECTORY modules/math/ + DESTINATION include/ne10/math + FILES_MATCHING PATTERN "*.h") + endif() + if(NE10_ENABLE_IMGPROC) + install(DIRECTORY modules/imgproc/ + DESTINATION include/ne10/imgproc + FILES_MATCHING PATTERN "*.h") + endif() + + if(NE10_ENABLE_PHYSICS) + install(DIRECTORY modules/physics/ + DESTINATION include/ne10/physics + FILES_MATCHING PATTERN "*.h") + endif() + # uninstall rules + configure_file( + ${CMAKE_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake + @ONLY) + + add_custom_target(uninstall + ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake + ) +endif() diff --git a/cmake/cmake_uninstall.cmake.in b/cmake/cmake_uninstall.cmake.in index 9ae1ae4b..84cba82b 100644 --- a/cmake/cmake_uninstall.cmake.in +++ b/cmake/cmake_uninstall.cmake.in @@ -1,32 +1,32 @@ # http://www.vtk.org/Wiki/CMake_FAQ#Can_I_do_.22make_uninstall.22_with_CMake.3F IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt") - MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"") + MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"") ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt") FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files) STRING(REGEX REPLACE "\n" ";" files "${files}") FOREACH(file ${files}) - MESSAGE(STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"") - IF(EXISTS "$ENV{DESTDIR}${file}") - EXEC_PROGRAM( - "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\"" - OUTPUT_VARIABLE rm_out - RETURN_VALUE rm_retval - ) - IF(NOT "${rm_retval}" STREQUAL 0) - MESSAGE(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"") - ENDIF(NOT "${rm_retval}" STREQUAL 0) - ELSEIF(IS_SYMLINK "$ENV{DESTDIR}${file}") - EXEC_PROGRAM( - "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\"" - OUTPUT_VARIABLE rm_out - RETURN_VALUE rm_retval - ) - IF(NOT "${rm_retval}" STREQUAL 0) - MESSAGE(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"") - ENDIF(NOT "${rm_retval}" STREQUAL 0) - ELSE(EXISTS "$ENV{DESTDIR}${file}") - MESSAGE(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.") - ENDIF(EXISTS "$ENV{DESTDIR}${file}") + MESSAGE(STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"") + IF(EXISTS "$ENV{DESTDIR}${file}") + EXEC_PROGRAM( + "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\"" + OUTPUT_VARIABLE rm_out + RETURN_VALUE rm_retval + ) + IF(NOT "${rm_retval}" STREQUAL 0) + MESSAGE(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"") + ENDIF(NOT "${rm_retval}" STREQUAL 0) + ELSEIF(IS_SYMLINK "$ENV{DESTDIR}${file}") + EXEC_PROGRAM( + "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\"" + OUTPUT_VARIABLE rm_out + RETURN_VALUE rm_retval + ) + IF(NOT "${rm_retval}" STREQUAL 0) + MESSAGE(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"") + ENDIF(NOT "${rm_retval}" STREQUAL 0) + ELSE(EXISTS "$ENV{DESTDIR}${file}") + MESSAGE(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.") + ENDIF(EXISTS "$ENV{DESTDIR}${file}") ENDFOREACH(file)