refactor affine project

terasakisatoshi · Jun 22, 2024 · daa8456 · daa8456
1 parent f5db178
commit daa8456
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 19 deletions.
diff --git a/.github/workflows/affine.yml b/.github/workflows/affine.yml
@@ -44,13 +44,7 @@ jobs:
           version: ${{ matrix.version }}
           arch: ${{ matrix.arch }}
       - uses: julia-actions/cache@v1
-      - name: Install CxxWrap
-        run: julia -e 'using Pkg; Pkg.add("CxxWrap")'
       - name: Install Eigen
         run: sudo apt-get install libeigen3-dev
-      - name: Build shared libraries
-        run: bash build.sh
-      - name: Run Julia Tests
-        run: julia --project -e 'using Pkg; Pkg.test()'
-      - name: Run CXX Tests
-        run: make test
+      - uses: julia-actions/julia-buildpkg@v1
+      - uses: julia-actions/julia-runtest@v1
diff --git a/affine/Makefile b/affine/Makefile
diff --git a/affine/CMakeLists.txt → affine/deps/CMakeLists.txt b/affine/CMakeLists.txt → affine/deps/CMakeLists.txt
diff --git a/affine/deps/Makefile b/affine/deps/Makefile
@@ -0,0 +1,14 @@
+CXXWRAP_PREFIX=`julia --project -e 'using CxxWrap; CxxWrap.prefix_path() |> print'`
+
+.PHONY: all run build test clean
+all: build
+
+build: *.cpp
+	cmake -S . -B ./build -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=$CXXWRAP_PREFIX
+	cmake --build ./build --config Release -j `nproc`
+
+test: build
+	ctest --test-dir ./build
+
+clean:
+	$(RM) -r build
diff --git a/affine/affine.cpp → affine/deps/affine.cpp b/affine/affine.cpp → affine/deps/affine.cpp
diff --git a/affine/affine.hpp → affine/deps/affine.hpp b/affine/affine.hpp → affine/deps/affine.hpp
diff --git a/affine/deps/build.jl b/affine/deps/build.jl
@@ -0,0 +1 @@
+run(`bash build.sh`)
diff --git a/affine/build.sh → affine/deps/build.sh b/affine/build.sh → affine/deps/build.sh
diff --git a/affine/jl_affine.cpp → affine/deps/jl_affine.cpp b/affine/jl_affine.cpp → affine/deps/jl_affine.cpp
diff --git a/affine/main.cpp → affine/deps/main.cpp b/affine/main.cpp → affine/deps/main.cpp
diff --git a/affine/test/CMakeLists.txt → affine/deps/test/CMakeLists.txt b/affine/test/CMakeLists.txt → affine/deps/test/CMakeLists.txt
diff --git a/affine/test/test_affine.cpp → affine/deps/test/test_affine.cpp b/affine/test/test_affine.cpp → affine/deps/test/test_affine.cpp
diff --git a/affine/src/MyCxxWrap5.jl b/affine/src/MyCxxWrap5.jl
@@ -10,7 +10,7 @@ using ..MyCxxWrap5
 using CxxWrap
 using Libdl
 
-@wrapmodule(() -> joinpath(pkgdir(@__MODULE__), "build/lib/libjl_affine.$(dlext)"))
+@wrapmodule(() -> joinpath(pkgdir(@__MODULE__), "../deps/build/lib/libjl_affine.$(dlext)"))
 
 function __init__()
     @initcxx