Skip to content

Commit

Permalink
build: fix installation and change build default flags (#372)
Browse files Browse the repository at this point in the history
* Change default submodules and fix install issue

The wrong target was used for installation of targets

* Disable flag as we changed the default
  • Loading branch information
jmigual committed Aug 4, 2022
1 parent 973baa3 commit dbb4547
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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}
)
Expand Down

0 comments on commit dbb4547

Please sign in to comment.