Re: [Firebird-devel] Firebird and CMake and Darwin
I see. If architecture/i386/io.h is used, we need to add some #ifdefs here. Correct, otherwise the default Darwin build will be broken if that line is commented out. By the way did you try to build Firebird with cmake? Does it work? No, cureently we build using GNU Make and either gcc/g++ or clang Paul -- New Year. New Location. New Benefits. New Data Center in Ashburn, VA. GigeNET is offering a free month of service with a new server in Ashburn. Choose from 2 high performing configs, both with 100TB of bandwidth. Higher redundancy.Lower latency.Increased capacity.Completely compliant. http://p.sf.net/sfu/gigenet Firebird-Devel mailing list, web interface at https://lists.sourceforge.net/lists/listinfo/firebird-devel
[Firebird-devel] Firebird and CMake and Darwin
Using: --- src/isql/InputDevices.cpp (revision 60530) +++ src/isql/InputDevices.cpp (working copy) @@ -23,12 +23,12 @@ #include firebird.h #ifdef DARWIN -#if defined(i386) || defined(__x86_64__) -#include architecture/i386/io.h -#else +//#if defined(i386) || defined(__x86_64__) +//#include architecture/i386/io.h +//#else #include io.h +//#endif #endif -#endif Produces: g++ -I../src/include/gen -I../src/include -I../src/vulcan -DNAMESPACE=Vulcan -I../extern/icu/source/common -I../extern/icu/source/i 18n -ggdb -DDARWIN -pipe -MMD -fPIC -fno-common -Wall -mmacosx-version-min=10.7 -DDEV_BUILD -D_THREAD_SAFE -fvisibility-inlines-hi dden -fvisibility=hidden -c ../src/isql/InputDevices.cpp -o ../temp/std/isql/InputDevices.o ../src/isql/InputDevices.cpp:29:10: fatal error: 'io.h' file not found #include io.h ^ 1 error generated. make: *** [../temp/std/isql/InputDevices.o] Error 1 -- io.h is found in architecture/i386/ on Darwin Index: src/yvalve/config/os/darwin/config_root.cpp === --- src/yvalve/config/os/darwin/config_root.cpp (revision 60530) +++ src/yvalve/config/os/darwin/config_root.cpp (working copy) @@ -37,7 +37,7 @@ #include ../common/os/path_utils.h #include ../common/file_params.h -#include CoreServices/CoreServices.h +//#include CoreServices/CoreServices.h #include CoreFoundation/CFBundle.h #include CoreFoundation/CFURL.h #include mach-o/dyld.h CoreServices.h is the master include file for multiple services found on Darwin However it doesn't look like we depend on this include file any more. config_root.cpp was rewritten for 2.5 (use Posix dl functions not DarwinNS), so CoreServices.h looks like its now an artefact from previous versions. Regards Paul -- New Year. New Location. New Benefits. New Data Center in Ashburn, VA. GigeNET is offering a free month of service with a new server in Ashburn. Choose from 2 high performing configs, both with 100TB of bandwidth. Higher redundancy.Lower latency.Increased capacity.Completely compliant. http://p.sf.net/sfu/gigenet Firebird-Devel mailing list, web interface at https://lists.sourceforge.net/lists/listinfo/firebird-devel
Re: [Firebird-devel] Firebird and CMake and Darwin
I see. If architecture/i386/io.h is used, we need to add some #ifdefs here. By the way did you try to build Firebird with cmake? Does it work? On 22 January 2015 at 15:31, Paul Beach pbe...@ibphoenix.com wrote: Using: --- src/isql/InputDevices.cpp (revision 60530) +++ src/isql/InputDevices.cpp (working copy) @@ -23,12 +23,12 @@ #include firebird.h #ifdef DARWIN -#if defined(i386) || defined(__x86_64__) -#include architecture/i386/io.h -#else +//#if defined(i386) || defined(__x86_64__) +//#include architecture/i386/io.h +//#else #include io.h +//#endif #endif -#endif Produces: g++ -I../src/include/gen -I../src/include -I../src/vulcan -DNAMESPACE=Vulcan -I../extern/icu/source/common -I../extern/icu/source/i 18n -ggdb -DDARWIN -pipe -MMD -fPIC -fno-common -Wall -mmacosx-version-min=10.7 -DDEV_BUILD -D_THREAD_SAFE -fvisibility-inlines-hi dden -fvisibility=hidden -c ../src/isql/InputDevices.cpp -o ../temp/std/isql/InputDevices.o ../src/isql/InputDevices.cpp:29:10: fatal error: 'io.h' file not found #include io.h ^ 1 error generated. make: *** [../temp/std/isql/InputDevices.o] Error 1 -- io.h is found in architecture/i386/ on Darwin Index: src/yvalve/config/os/darwin/config_root.cpp === --- src/yvalve/config/os/darwin/config_root.cpp (revision 60530) +++ src/yvalve/config/os/darwin/config_root.cpp (working copy) @@ -37,7 +37,7 @@ #include ../common/os/path_utils.h #include ../common/file_params.h -#include CoreServices/CoreServices.h +//#include CoreServices/CoreServices.h #include CoreFoundation/CFBundle.h #include CoreFoundation/CFURL.h #include mach-o/dyld.h CoreServices.h is the master include file for multiple services found on Darwin However it doesn't look like we depend on this include file any more. config_root.cpp was rewritten for 2.5 (use Posix dl functions not DarwinNS), so CoreServices.h looks like its now an artefact from previous versions. Regards Paul -- New Year. New Location. New Benefits. New Data Center in Ashburn, VA. GigeNET is offering a free month of service with a new server in Ashburn. Choose from 2 high performing configs, both with 100TB of bandwidth. Higher redundancy.Lower latency.Increased capacity.Completely compliant. http://p.sf.net/sfu/gigenet Firebird-Devel mailing list, web interface at https://lists.sourceforge.net/lists/listinfo/firebird-devel -- Egor Pugin -- New Year. New Location. New Benefits. New Data Center in Ashburn, VA. GigeNET is offering a free month of service with a new server in Ashburn. Choose from 2 high performing configs, both with 100TB of bandwidth. Higher redundancy.Lower latency.Increased capacity.Completely compliant. http://p.sf.net/sfu/gigenet Firebird-Devel mailing list, web interface at https://lists.sourceforge.net/lists/listinfo/firebird-devel
