Update configure for build process

shikokuchuo · shikokuchuo · commit db9a35a00430 · 2025-12-02T10:26:36.000Z
diff --git a/.gitignore b/.gitignore
@@ -2,7 +2,8 @@
 .Rhistory
 .RData
 .Ruserdata
-install
+/build/
+/install/
 /docs/
 /revdep/
 /.claude/
diff --git a/cleanup b/cleanup
@@ -1,2 +1,2 @@
 #!/bin/sh
-rm -rf src/Makevars install
+rm -rf src/Makevars build install
diff --git a/cleanup.win b/cleanup.win
@@ -1 +1 @@
-rm -rf src/Makevars install
+rm -rf src/Makevars build install
diff --git a/configure b/configure
@@ -78,13 +78,13 @@ then
       exit 1
     fi
   fi
-  cd fswatch
-  cmake -DCMAKE_INSTALL_PREFIX=../install -DCMAKE_INSTALL_LIBDIR=lib \
+  cmake -S src/fswatch -B build \
+  -DCMAKE_INSTALL_PREFIX=install -DCMAKE_INSTALL_LIBDIR=lib \
   -DBUILD_LIBS_ONLY=1 -DUSE_NLS=0 -DCMAKE_POSITION_INDEPENDENT_CODE=1 \
   -DCMAKE_COLOR_MAKEFILE=0 -DCMAKE_INSTALL_MESSAGE=NEVER \
-  -DCMAKE_BUILD_TYPE=Release .
-  cmake --build . --target install
-  cd ..
+  -DCMAKE_BUILD_TYPE=Release
+  cmake --build build --target install
+  rm -rf build
 
   if [ -d "install/lib" ]
   then
diff --git a/configure.ucrt b/configure.ucrt
@@ -6,13 +6,13 @@ LDFLAGS=`"${R_HOME}/bin/R" CMD config LDFLAGS`
 export CC CFLAGS CPPFLAGS LDFLAGS
 
 echo "Compiling 'libfswatch' from source..."
-cd fswatch
-cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=../install \
+cmake -S src/fswatch -B build -G "Unix Makefiles" \
+  -DCMAKE_INSTALL_PREFIX=install \
   -DBUILD_LIBS_ONLY=1 -DUSE_NLS=0 -DCMAKE_POSITION_INDEPENDENT_CODE=1 \
   -DCMAKE_COLOR_MAKEFILE=0 -DCMAKE_INSTALL_MESSAGE=NEVER \
-  -DCMAKE_BUILD_TYPE=Release .
-cmake --build . --target install
-cd ..
+  -DCMAKE_BUILD_TYPE=Release
+cmake --build build --target install
+rm -rf build
 
 # Success
 exit 0
diff --git a/configure.win b/configure.win
@@ -9,15 +9,13 @@ for ARCH in x64 i386; do
 
     echo "Compiling 'libfswatch' from source for ${ARCH} ..."
 
-    cd fswatch
-    mkdir ${ARCH}
-    cd ${ARCH}
-    cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=../../install/${ARCH} \
+    cmake -S src/fswatch -B build -G "Unix Makefiles" \ 
+      -DCMAKE_INSTALL_PREFIX=install/${ARCH} \
       -DBUILD_LIBS_ONLY=1 -DUSE_NLS=0 -DCMAKE_POSITION_INDEPENDENT_CODE=1 \
       -DCMAKE_COLOR_MAKEFILE=0 -DCMAKE_INSTALL_MESSAGE=NEVER \
-      -DCMAKE_BUILD_TYPE=Release ..
-    cmake --build . --target install
-    cd ../..
+      -DCMAKE_BUILD_TYPE=Release
+    cmake --build build --target install
+    rm -rf build
 
   else
   echo "Note: ${ARCH} not installed, skipping ..."

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`#!/bin/sh`
`2`		`-rm -rf src/Makevars install`
	`2`	`+rm -rf src/Makevars build install`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-rm -rf src/Makevars install`
	`1`	`+rm -rf src/Makevars build install`