diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index be392c127..5c0c98c96 100755 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -36,7 +36,11 @@ configure_file( "${PROJECT_BINARY_DIR}/src/ports/devicedata.h" ) -find_path( OpENer_BUILDSUPPORT_DIR OpENer.cmake ${PROJECT_SOURCE_DIR}/buildsupport ) +find_path(OpENer_BUILDSUPPORT_DIR + NAMES OpENer.cmake + PATHS "${PROJECT_SOURCE_DIR}/buildsupport" + NO_CMAKE_FIND_ROOT_PATH +) INCLUDE( ${OpENer_BUILDSUPPORT_DIR}/OpENer.cmake ) diff --git a/source/src/ports/POSIX/CMakeLists.txt b/source/src/ports/POSIX/CMakeLists.txt index b0b0dd852..2edf69a23 100755 --- a/source/src/ports/POSIX/CMakeLists.txt +++ b/source/src/ports/POSIX/CMakeLists.txt @@ -66,5 +66,5 @@ if( NOT OpENer_TESTS) endif() if(NOT ${CMAKE_INSTALL_BINDIR} STREQUAL "") - install (PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/OpENer DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}) + install (PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/OpENer DESTINATION ${CMAKE_INSTALL_BINDIR}) endif() diff --git a/source/src/ports/POSIX/sample_application/CMakeLists.txt b/source/src/ports/POSIX/sample_application/CMakeLists.txt index 96479bc76..a971ee8c1 100644 --- a/source/src/ports/POSIX/sample_application/CMakeLists.txt +++ b/source/src/ports/POSIX/sample_application/CMakeLists.txt @@ -15,3 +15,9 @@ endif() add_library(SAMPLE_APP sampleapplication.c ${SAMPLE_APP_DLR_ONLY_SRC}) target_link_libraries( SAMPLE_APP NVDATA ) +if( OPENER_INSTALL_AS_LIB ) + install(TARGETS SAMPLE_APP + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ) +endif()