Use cloop cmake build

Author: asfernandes

builds/posix/Makefile.in

@@ -197,7 +197,17 @@ ifeq ($(CLIENT_ONLY_FLG),N)
 	CC="$(CC)" CFLAGS="$(CFLAGS)" AR="$(AR)" $(MAKE) -C $(ROOT)/extern/btyacc
 endif
 
-	CXX="$(CXX)" LD_FLAGS="$(PLATFORM_LDFLAGS)" $(MAKE) -C $(ROOT)/extern/cloop TARGET=release WITH_FPC=0 BUILD_DIR=$(TMP_ROOT)/cloop OUT_DIR=$(GEN_ROOT)/$(TARGET)/cloop core
+	mkdir -p $(GEN_ROOT)/$(TARGET)/cloop
+
+ifeq ($(PLATFORM),DARWIN)
+	cd $(GEN_ROOT)/$(TARGET)/cloop && \
+	cmake -DCMAKE_BUILD_TYPE=$(FB_CMAKE_BUILD_TYPE) -DCMAKE_CXX_COMPILER="$(CXX)" -DCLOOP_BUILD_TESTS=OFF $(ROOT)/extern/cloop
+else
+	cd $(GEN_ROOT)/$(TARGET)/cloop && \
+	cmake -DCMAKE_BUILD_TYPE=$(FB_CMAKE_BUILD_TYPE) -DCMAKE_CXX_COMPILER="$(CXX)" -DCLOOP_BUILD_TESTS=OFF -DCMAKE_CXX_FLAGS="-static-libstdc++" -DCMAKE_EXE_LINKER_FLAGS="-static-libstdc++" $(ROOT)/extern/cloop
+endif
+	cd $(GEN_ROOT)/$(TARGET)/cloop && \
+	cmake --build .
 
 	CC="$(CC)" CFLAGS="$(CFLAGS)" AR="$(AR)" $(MAKE) -C $(ROOT)/extern/decNumber
 	ln -sf $(ROOT)/extern/decNumber/libdecFloat.a $(STATIC_LIB)

builds/posix/make.defaults

@@ -187,7 +187,7 @@ AR=			ar @AR_OPTIONS@
 LN=			@LN_S@
 RANLIB=			@RANLIB@
 BTYACC=$(ROOT)/extern/btyacc/btyacc
-CLOOP=$(GEN_ROOT)/$(TARGET)/cloop/release/bin/cloop
+CLOOP=$(GEN_ROOT)/$(TARGET)/cloop/bin/cloop
 
 AR =	@AR@
 CC =	@CC@

builds/win32/gen_helper.nmake

@@ -1,9 +1,7 @@
 
 all: updateCloopInterfaces
 
-CLOOP=$(FB_GEN_DIR)\cloop.exe
-CLOOP_DIR=$(FB_ROOT_PATH)\extern\cloop\src\cloop
-CLOOP_SRC=$(CLOOP_DIR)\*.cpp
+CLOOP=$(FB_GEN_DIR)\$(FB_TARGET_PLATFORM)\cloop\bin\$(FB_CONFIG)\cloop
 
 IDL_ROOT=$(FB_ROOT_PATH)\src\include\firebird
 IDL_FILE=$(IDL_ROOT)\FirebirdInterface.idl
@@ -21,23 +19,10 @@ RPL_AWK_SRC=$(MISC)\def_awk.c
 RPL_GREP=$(FB_GEN_DIR)\isc_grep.exe
 RPL_GREP_SRC=$(MISC)\isc_grep.c
 # These utils are platform and build independent, use fixed temporary dir.
-UTL_TMP_DIR=$(FB_TEMP_DIR)\Release\misc
-
-CPPFLAGS = /MD /EHsc /O2 /D "_CRT_SECURE_NO_WARNINGS" /D "WIN32" /D "NDEBUG" /D "_CONSOLE"
 
 updateCloopInterfaces: $(API_H_FILE) $(API_PAS_FILE)
 
 
-$(CLOOP) $(RPL_AWK) $(RPL_GREP): $(UTL_TMP_DIR)
-
-$(UTL_TMP_DIR):
-	-mkdir $@ 2>nul
-
-$(CLOOP): $(CLOOP_SRC)
-	$(CPP) $(CPPFLAGS) /Fe$@ /Fo$(UTL_TMP_DIR)\ $(CLOOP_SRC)
-
-$(API_H_FILE) $(API_PAS_FILE): $(CLOOP)
-
 $(API_H_FILE): $(IDL_FILE)
 	$(CLOOP) $(IDL_FILE) c++ $@ IDL_FB_INTERFACES_H Firebird I
 

builds/win32/make_boot.bat

@@ -205,6 +205,13 @@ goto :EOF
 :interfaces
 @echo.
 @echo Building CLOOP and generating interfaces...
+@mkdir %FB_GEN_DIR%\%FB_TARGET_PLATFORM%\cloop 2>nul
+@pushd %FB_GEN_DIR%\%FB_TARGET_PLATFORM%\cloop
+@cmake -G "%MSVC_CMAKE_GENERATOR%" -A %FB_TARGET_PLATFORM% -S %FB_ROOT_PATH%\extern\cloop -DCLOOP_BUILD_TESTS=OFF
+if errorlevel 1 call :boot2 interfaces
+@cmake --build %FB_GEN_DIR%\%FB_TARGET_PLATFORM%\cloop --target ALL_BUILD --config %FB_CONFIG% > cloop_%FB_CONFIG%_%FB_TARGET_PLATFORM%.log
+if errorlevel 1 call :boot2 interfaces
+@popd
 @nmake /s /x interfaces_%FB_TARGET_PLATFORM%.log /f gen_helper.nmake updateCloopInterfaces
 if errorlevel 1 call :boot2 interfaces
 goto :EOF