diff --git a/CMakeLists.txt b/CMakeLists.txt index ed415261ec..6304a3f5a2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,12 +57,12 @@ endif() # Layout build dir like install dir include(GNUInstallDirs) if(UNIX) - option(BUILD_SHARED_LIBS "Build shared libraries (.so or .dyld)." ON) + option(BUILD_SHARED_LIBS "Build shared libraries (.so or .dylib)." ON) set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}) set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}) - # for multi-config build system (e.g. xcode) + # for multi-config build system (e.g. Xcode, Ninja Multi-Config) foreach(OUTPUTCONFIG IN LISTS CMAKE_CONFIGURATION_TYPES) string(TOUPPER ${OUTPUTCONFIG} OUTPUTCONFIG) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${OUTPUTCONFIG}/${CMAKE_INSTALL_LIBDIR}) diff --git a/cmake/cpp.cmake b/cmake/cpp.cmake index 98c5f5af76..a35292281a 100644 --- a/cmake/cpp.cmake +++ b/cmake/cpp.cmake @@ -472,7 +472,6 @@ function(add_cxx_sample FILE_NAME) set_target_properties(${SAMPLE_NAME} PROPERTIES INSTALL_RPATH "$ORIGIN/${libdir_relative_path}") endif() - install(TARGETS ${SAMPLE_NAME}) if(BUILD_TESTING) @@ -509,7 +508,6 @@ function(add_cxx_example FILE_NAME) set_target_properties(${EXAMPLE_NAME} PROPERTIES INSTALL_RPATH "$ORIGIN/${libdir_relative_path}") endif() - install(TARGETS ${EXAMPLE_NAME}) if(BUILD_TESTING)