update cmake and firebird.bkl

CMakeLists.txt

@@ -196,6 +196,7 @@ list(APPEND HEADER_LIST
         ${SOURCEDIR}/engine/MetadataLoader.h
         ${SOURCEDIR}/frutils.h
         ${SOURCEDIR}/frversion.h
+        ${SOURCEDIR}/firebird/constants.h
         ${SOURCEDIR}/gui/AboutBox.h
         ${SOURCEDIR}/gui/AdvancedMessageDialog.h
         ${SOURCEDIR}/gui/AdvancedSearchFrame.h
@@ -256,7 +257,6 @@ list(APPEND HEADER_LIST
         ${SOURCEDIR}/MasterPassword.h
         ${SOURCEDIR}/metadata/collection.h
         ${SOURCEDIR}/metadata/column.h
-        ${SOURCEDIR}/metadata/constants.h
         ${SOURCEDIR}/metadata/constraints.h
         ${SOURCEDIR}/metadata/CreateDDLVisitor.h
         ${SOURCEDIR}/metadata/database.h
@@ -318,9 +318,32 @@ list(APPEND IBPP_SOURCE_LIST
         ${SOURCEDIR}/ibpp/user.cpp
 )
 list(APPEND IBPP_HEADER_LIST
+        ${SOURCEDIR}/firebird/include/ibase.h
+        ${SOURCEDIR}/firebird/include/ierror.h
+        ${SOURCEDIR}/firebird/include/firebird/impl/blr.h
+        ${SOURCEDIR}/firebird/include/firebird/impl/consts_pub.h
+        ${SOURCEDIR}/firebird/include/firebird/impl/dsc_pub.h
+        ${SOURCEDIR}/firebird/include/firebird/impl/inf_pub.h
+        ${SOURCEDIR}/firebird/include/firebird/impl/msg_helper.h
+        ${SOURCEDIR}/firebird/include/firebird/impl/sqlda_pub.h
+        ${SOURCEDIR}/firebird/include/firebird/impl/types_pub.h        
+		${SOURCEDIR}/firebird/include/firebird/impl/msg/all.h
+		${SOURCEDIR}/firebird/include/firebird/impl/msg/dsql.h
+		${SOURCEDIR}/firebird/include/firebird/impl/msg/dyn.h
+		${SOURCEDIR}/firebird/include/firebird/impl/msg/fbsvcmgr.h
+		${SOURCEDIR}/firebird/include/firebird/impl/msg/fbtracemgr.h
+		${SOURCEDIR}/firebird/include/firebird/impl/msg/gbak.h
+		${SOURCEDIR}/firebird/include/firebird/impl/msg/gfix.h
+		${SOURCEDIR}/firebird/include/firebird/impl/msg/gsec.h
+		${SOURCEDIR}/firebird/include/firebird/impl/msg/gstat.h
+		${SOURCEDIR}/firebird/include/firebird/impl/msg/isql.h
+		${SOURCEDIR}/firebird/include/firebird/impl/msg/jrd.h
+		${SOURCEDIR}/firebird/include/firebird/impl/msg/jrd_bugchk.h
+		${SOURCEDIR}/firebird/include/firebird/impl/msg/nbackup.h
+		${SOURCEDIR}/firebird/include/firebird/impl/msg/sqlerr.h
+		${SOURCEDIR}/firebird/include/firebird/impl/msg/sqlwarn.h
+		${SOURCEDIR}/firebird/include/firebird/impl/msg/utl.h		
         ${SOURCEDIR}/ibpp/_ibpp.h
-        ${SOURCEDIR}/ibpp/ibase.h
-        ${SOURCEDIR}/ibpp/iberror.h
         ${SOURCEDIR}/ibpp/ibpp.h
 )
 

flamerobin.bkl

@@ -246,6 +246,7 @@ Accepted values: AMD64, IA64.
         $(SOURCEDIR)/engine/MetadataLoader.h
         $(SOURCEDIR)/frutils.h
         $(SOURCEDIR)/frversion.h
+		${SOURCEDIR}/firebird/constants.h
         $(SOURCEDIR)/gui/AboutBox.h
         $(SOURCEDIR)/gui/AdvancedMessageDialog.h
         $(SOURCEDIR)/gui/AdvancedSearchFrame.h
@@ -750,9 +751,32 @@ Accepted values: AMD64, IA64.
 <!-- build IBPP library -->
 
     <set var="IBPP_HEADERFILES">
+        ${SOURCEDIR}/firebird/include/ibase.h
+        ${SOURCEDIR}/firebird/include/ierror.h
+        ${SOURCEDIR}/firebird/include/firebird/impl/blr.h
+        ${SOURCEDIR}/firebird/include/firebird/impl/consts_pub.h
+        ${SOURCEDIR}/firebird/include/firebird/impl/dsc_pub.h
+        ${SOURCEDIR}/firebird/include/firebird/impl/inf_pub.h
+        ${SOURCEDIR}/firebird/include/firebird/impl/msg_helper.h
+        ${SOURCEDIR}/firebird/include/firebird/impl/sqlda_pub.h
+        ${SOURCEDIR}/firebird/include/firebird/impl/types_pub.h        
+		${SOURCEDIR}/firebird/include/firebird/impl/msg/all.h
+		${SOURCEDIR}/firebird/include/firebird/impl/msg/dsql.h
+		${SOURCEDIR}/firebird/include/firebird/impl/msg/dyn.h
+		${SOURCEDIR}/firebird/include/firebird/impl/msg/fbsvcmgr.h
+		${SOURCEDIR}/firebird/include/firebird/impl/msg/fbtracemgr.h
+		${SOURCEDIR}/firebird/include/firebird/impl/msg/gbak.h
+		${SOURCEDIR}/firebird/include/firebird/impl/msg/gfix.h
+		${SOURCEDIR}/firebird/include/firebird/impl/msg/gsec.h
+		${SOURCEDIR}/firebird/include/firebird/impl/msg/gstat.h
+		${SOURCEDIR}/firebird/include/firebird/impl/msg/isql.h
+		${SOURCEDIR}/firebird/include/firebird/impl/msg/jrd.h
+		${SOURCEDIR}/firebird/include/firebird/impl/msg/jrd_bugchk.h
+		${SOURCEDIR}/firebird/include/firebird/impl/msg/nbackup.h
+		${SOURCEDIR}/firebird/include/firebird/impl/msg/sqlerr.h
+		${SOURCEDIR}/firebird/include/firebird/impl/msg/sqlwarn.h
+		${SOURCEDIR}/firebird/include/firebird/impl/msg/utl.h		
         $(SOURCEDIR)/ibpp/_ibpp.h
-        $(SOURCEDIR)/ibpp/ibase.h
-        $(SOURCEDIR)/ibpp/iberror.h
         $(SOURCEDIR)/ibpp/ibpp.h
     </set>