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
This commit is contained in:
Joan Marcè i Igual 2022-08-04 13:29:15 +02:00 committed by GitHub
parent 973baa3749
commit dbb4547d31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View File

@ -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

View File

@ -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}
)