Merge pull request #38 from qmfrederik/features/remove-gnustep-cmake

Remove gnustep-cmake

Author: qmfrederik

.github/workflows/ci.yaml

@@ -58,16 +58,13 @@ jobs:
         run: conan create gnustep-gui --profile:a=${{ github.workspace }}/profiles/windows-clang
       - name: Install gnustep-headless
         run: conan create gnustep-headless --profile:a=${{ github.workspace }}/profiles/windows-clang
-      - name: Install gnustep-cmake
-        run: conan create gnustep-cmake --profile:a=${{ github.workspace }}/profiles/windows-clang
       - name: Build tutorial
         run: |
           conan install conanfile.txt --profile:a=../profiles/windows-clang --output-folder=build/ --conf="tools.env.virtualenv:powershell=pwsh.exe"
-          cd build/
-          cmake .. -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_POLICY_DEFAULT_CMP0091="NEW" -GNinja
-          cmake --build .
-          ./conanrun.ps1
-          ./Tutorial.exe
+          cmake -S . -B build -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_POLICY_DEFAULT_CMP0091="NEW" -GNinja
+          cmake --build build
+          ./build/conanrun.ps1
+          ./build/Tutorial.exe
         working-directory: tutorial/
       - name: Upload Conan packages to Cloudsmith
         run: |
@@ -180,16 +177,13 @@ jobs:
         if: matrix.family == 'rhel'
       - name: Install gnustep-headless
         run: .python3/bin/conan create gnustep-headless --profile:a=profiles/linux-clang
-      - name: Install gnustep-cmake
-        run: .python3/bin/conan create gnustep-cmake --profile:a=profiles/linux-clang
       - name: Build tutorial
         run: |
           ../.python3/bin/conan install conanfile.txt --profile:a=../profiles/linux-clang --output-folder=build/
-          cd build/
-          CC=clang CXX=clang++ LDFLAGS="-fuse-ld=lld" cmake .. -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Release
-          cmake --build .
-          . ./conanrun.sh
-          ./Tutorial
+          CC=clang CXX=clang++ LDFLAGS="-fuse-ld=lld" cmake -S. -B build/ -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Release
+          cmake --build build
+          . build/conanrun.sh
+          ./build/Tutorial
         working-directory: tutorial/
       - uses: actions/upload-artifact@v4
         if: always()

README.md

@@ -40,7 +40,6 @@ conan create gnustep-make --profile:a=profiles/windows-clang
 conan create gnustep-base --profile:a=profiles/windows-clang
 conan create gnustep-gui --profile:a=profiles/windows-clang
 conan create gnustep-headless --profile:a=profiles/windows-clang
-conan create gnustep-cmake --profile:a=profiles/windows-clang
 ```
 
 This will configure GNUstep Base and all of its dependencies.
@@ -64,7 +63,6 @@ conan create gnustep-make --profile:a=profiles/linux-clang
 conan create gnustep-base --profile:a=profiles/linux-clang
 conan create gnustep-gui --profile:a=profiles/linux-clang
 conan create gnustep-headless --profile:a=profiles/linux-clang
-conan create gnustep-cmake --profile:a=profiles/linux-clang
 ```
 
 ## Tips & Tricks

gnustep-base/test_package/test_package.m

@@ -15,6 +15,9 @@ @implementation Test
 
 int main(void)
 {
+    // Basic tests of gnustep-base
+    NSLog(@"Hello, World!");
+
     // This ensures we have a healty Objective C development environment once gnustep-make has been configured.
     // In particular, we're testing the various Objective C compiler options (ABI, exception model,...) are configured
     // correctly, by invoking an Objective C method which throws.

gnustep-cmake/CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.10)
 project(Tutorial)
 
 find_package(libobjc2)
-find_package(GNUstep)
+find_package(gnustep-base)
 
 add_executable(Tutorial main.m)
-target_link_libraries(Tutorial GNUstep::Base)
+target_link_libraries(Tutorial gnustep-base::gnustep-base libobjc2::libobjc2)

gnustep-cmake/GNUstepConfig.cmake

@@ -1,9 +1,6 @@
 [requires]
-gnustep-base/[^1.31.1]
 libobjc2/[^2.2.1]
-
-[tool_requires]
-gnustep-cmake/[^0.1.0]
+gnustep-base/[^1.31.1]
 
 [generators]
 CMakeDeps