diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 71bae78..bb35256 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,12 +29,6 @@ jobs: - name: Build run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4 - - name: Reconfig CMake for export - run: cmake ${{github.workspace}}/build -DSOLANACEAE_ECOSYSTEM_BUILD_PLUGINS=OFF - - - name: Build with export - run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 3 - - name: Test working-directory: ${{github.workspace}}/build run: ctest -C ${{env.BUILD_TYPE}} @@ -58,12 +52,6 @@ jobs: - name: Build run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 3 - - name: Reconfig CMake for export - run: cmake ${{github.workspace}}/build -DSOLANACEAE_ECOSYSTEM_BUILD_PLUGINS=OFF - - - name: Build with export - run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 3 - - name: Test working-directory: ${{github.workspace}}/build run: ctest -C ${{env.BUILD_TYPE}} @@ -98,12 +86,6 @@ jobs: - name: Build run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 3 - - name: Reconfig CMake for export - run: cmake ${{github.workspace}}/build -DSOLANACEAE_ECOSYSTEM_BUILD_PLUGINS=OFF - - - name: Build with export - run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 3 - - name: Test working-directory: ${{github.workspace}}/build run: ctest -C ${{env.BUILD_TYPE}} diff --git a/CMakeLists.txt b/CMakeLists.txt index dd58288..1f1d0c0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,19 +18,12 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib") set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") -option(SOLANACEAE_ECOSYSTEM_BUILD_PLUGINS "Build plugins and not hosts (totato)" ON) option(SOLANACEAE_ECOSYSTEM_BUILD_TESTING "Build tests" ${BUILD_TESTING}) message("II SOLANACEAE_ECOSYSTEM_BUILD_TESTING " ${SOLANACEAE_ECOSYSTEM_BUILD_TESTING}) -if (SOLANACEAE_ECOSYSTEM_BUILD_PLUGINS) - # uggly, but it needs to be defined for all dependencies too - # but this also means that we can not compile a host in the same cmake run as plugins - #add_compile_definitions(ENTT_API_IMPORT) - # what if its always export? - add_compile_definitions(ENTT_API_EXPORT) -else() - add_compile_definitions(ENTT_API_EXPORT) -endif() +# uggly, but it needs to be defined for all dependencies too +# what if its always export? +add_compile_definitions(ENTT_API_EXPORT) if (SOLANACEAE_ECOSYSTEM_BUILD_TESTING) include(CTest) @@ -69,7 +62,4 @@ endif() # cmake setup end -if (SOLANACEAE_ECOSYSTEM_BUILD_PLUGINS) - add_subdirectory(./plugins) -endif() - +add_subdirectory(./plugins) diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index a1ce3a9..83881a3 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -8,42 +8,39 @@ add_subdirectory(./entt) add_subdirectory(./solanaceae_contact) add_subdirectory(./solanaceae_message3) -set(SOLANACEAE_BRIDGE_BUILD_PLUGINS ${SOLANACEAE_ECOSYSTEM_BUILD_PLUGINS}) +set(SOLANACEAE_BRIDGE_BUILD_PLUGINS ON) add_subdirectory(./solanaceae_bridge) -set(SOLANACEAE_OBJECT_STORE_BUILD_TESTING ${SOLANACEAE_ECOSYSTEM_BUILD_TESTING}) +set(SOLANACEAE_OBJECT_STORE_BUILD_TESTING ON) add_subdirectory(./solanaceae_object_store) add_subdirectory(./solanaceae_message_serializer) -set(SOLANACEAE_MESSAGE_FRAGMENT_STORE_BUILD_PLUGINS ${SOLANACEAE_ECOSYSTEM_BUILD_PLUGINS}) +set(SOLANACEAE_MESSAGE_FRAGMENT_STORE_BUILD_PLUGINS ON) add_subdirectory(./solanaceae_message_fragment_store) add_subdirectory(./toxcore) add_subdirectory(./solanaceae_toxcore) add_subdirectory(./solanaceae_tox) -set(SOLANACEAE_TOX_UPNP_BUILD_PLUGINS ${SOLANACEAE_ECOSYSTEM_BUILD_PLUGINS}) +set(SOLANACEAE_TOX_UPNP_BUILD_PLUGINS ON) add_subdirectory(./solanaceae_tox_upnp) add_subdirectory(./solanaceae_ngc_ft1) -set(SOLANACEAE_ZOX_BUILD_PLUGINS ${SOLANACEAE_ECOSYSTEM_BUILD_PLUGINS}) +set(SOLANACEAE_ZOX_BUILD_PLUGINS ON) add_subdirectory(./solanaceae_zox) -set(SOLANACEAE_TOXIC_GAMES_BUILD_PLUGINS ${SOLANACEAE_ECOSYSTEM_BUILD_PLUGINS}) +set(SOLANACEAE_TOXIC_GAMES_BUILD_PLUGINS ON) add_subdirectory(./solanaceae_toxic_games) -set(SOLANACEAE_IRCCLIENT_BUILD_PLUGINS ${SOLANACEAE_ECOSYSTEM_BUILD_PLUGINS}) +set(SOLANACEAE_IRCCLIENT_BUILD_PLUGINS ON) add_subdirectory(./solanaceae_ircclient) -set(SOLANACEAE_CRDTNOTES_BUILD_PLUGINS ${SOLANACEAE_ECOSYSTEM_BUILD_PLUGINS}) +set(SOLANACEAE_CRDTNOTES_BUILD_PLUGINS ON) add_subdirectory(./solanaceae_crdtnotes) -set(SOLANACEAE_LLAMA-CPP-WEB_BUILD_PLUGINS ${SOLANACEAE_ECOSYSTEM_BUILD_PLUGINS}) +set(SOLANACEAE_LLAMA-CPP-WEB_BUILD_PLUGINS ON) add_subdirectory(./solanaceae_llama-cpp-web) -# plugins and hosts are mutally exclusive -if (NOT ${SOLANACEAE_ECOSYSTEM_BUILD_PLUGINS}) - add_subdirectory(./totato) -endif() +add_subdirectory(./totato)