From dbb4547d3160368feaaf55c3338ad085a8f968b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joan=20Marc=C3=A8=20i=20Igual?= Date: Thu, 4 Aug 2022 13:29:15 +0200 Subject: [PATCH] build: fix installation and change build default flags (#372) * Change default submodules and fix install issue The wrong target was used for installation of targets * Disable flag as we changed the default --- .github/workflows/ci.yml | 2 +- CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7001ae6..c8e65c6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,4 +23,4 @@ jobs: submodule_update: ON run_tests: ON unit_test_build: -DBUILD_UNIT_TESTS=ON - cmake_args: -DCMAKE_CXX_FLAGS=-std=c++11;-DUSE_SUBMODULES=ON + cmake_args: -DCMAKE_CXX_FLAGS=-std=c++11 diff --git a/CMakeLists.txt b/CMakeLists.txt index d1a045a..7a7592b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ PROJECT(sioclient option(BUILD_SHARED_LIBS "Build the shared library" OFF) option(BUILD_UNIT_TESTS "Builds unit tests target" OFF) -option(USE_SUBMODULES "Use source in local submodules instead of system libraries" OFF) +option(USE_SUBMODULES "Use source in local submodules instead of system libraries" ON) set(MAJOR 1) set(MINOR 6) @@ -158,7 +158,7 @@ install( FILES "${CMAKE_CURRENT_BINARY_DIR}/sioclient/sioclientConfig.cmake" "${CMAKE_CURRENT_BINARY_DIR}/sioclient/sioclientConfigVersion.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/sioclient/sioclientConfigTargets.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/sioclient/sioclientTargets.cmake" DESTINATION ${ConfigPackageLocation} )