[prev in list] [next in list] [prev in thread] [next in thread]
List: fdo-commits
Subject: [fdo-commits] r7870 - in sandbox/vcpkg: . Fdo/Unmanaged/Src Utilities/Common Utilities/ExpressionEng
From: svn_fdo () osgeo ! org
Date: 2019-09-30 15:30:24
Message-ID: 20190930153024.6FE87390249 () trac ! osgeo ! org
[Download RAW message or body]
Author: jng
Date: 2019-09-30 08:30:24 -0700 (Mon, 30 Sep 2019)
New Revision: 7870
Modified:
sandbox/vcpkg/CMakeLists.txt
sandbox/vcpkg/Fdo/Unmanaged/Src/CMakeLists.txt
sandbox/vcpkg/Utilities/Common/CMakeLists.txt
sandbox/vcpkg/Utilities/ExpressionEngine/Src/CMakeLists.txt
sandbox/vcpkg/Utilities/ExpressionEngine/Src/Util/FdoExpressionEngineUtilDataReader.cpp
Log:
Get ExpressionEngine building. Flip _UNICODE for ProvidersCommon, making that build \
again.
Modified: sandbox/vcpkg/CMakeLists.txt
===================================================================
--- sandbox/vcpkg/CMakeLists.txt 2019-09-30 15:10:25 UTC (rev 7869)
+++ sandbox/vcpkg/CMakeLists.txt 2019-09-30 15:30:24 UTC (rev 7870)
@@ -166,6 +166,8 @@
add_definitions( -DFULLPROTO -fPIC -DPIC )
endif( UNIX )
+# Establish "Not Set" as the default character set and let specific projects set
+# multi-byte or unicode as required
if (MSVC)
remove_definitions(-D_MBCS)
remove_definitions(-D_UNICODE)
Modified: sandbox/vcpkg/Fdo/Unmanaged/Src/CMakeLists.txt
===================================================================
--- sandbox/vcpkg/Fdo/Unmanaged/Src/CMakeLists.txt 2019-09-30 15:10:25 UTC (rev 7869)
+++ sandbox/vcpkg/Fdo/Unmanaged/Src/CMakeLists.txt 2019-09-30 15:30:24 UTC (rev 7870)
@@ -360,7 +360,7 @@
# FDO
add_library( FDO SHARED ${FDOSrc_SRCS} )
- target_compile_definitions( FDO PRIVATE EXP_FDO )
+ target_compile_definitions( FDO PRIVATE EXP_FDO _CRT_NON_CONFIRMING_SWPRINTFS )
target_link_libraries( FDO
PRIVATE
FDOCommon
Modified: sandbox/vcpkg/Utilities/Common/CMakeLists.txt
===================================================================
--- sandbox/vcpkg/Utilities/Common/CMakeLists.txt 2019-09-30 15:10:25 UTC (rev 7869)
+++ sandbox/vcpkg/Utilities/Common/CMakeLists.txt 2019-09-30 15:30:24 UTC (rev 7870)
@@ -1,35 +1,39 @@
include_directories(
- ${CMAKE_CURRENT_SOURCE_DIR}/Inc
- ${UNMANAGED_INCLUDE_DIR}
- ${UNMANAGED_COMMON_INCLUDE_DIR}
- )
+ ${CMAKE_CURRENT_SOURCE_DIR}/Inc
+ ${UNMANAGED_INCLUDE_DIR}
+ ${UNMANAGED_COMMON_INCLUDE_DIR}
+ )
if( UNIX )
- add_definitions( -D__USE_GNU -DLINUX -DLINUX_IA32 -pthread -DHAVE_GEOM_INFO_TYPE )
+ add_definitions( -D__USE_GNU -DLINUX -DLINUX_IA32 -pthread -DHAVE_GEOM_INFO_TYPE \
) endif( UNIX )
+if (MSVC)
+ add_definitions(-D_UNICODE)
+endif (MSVC)
+
set( ProvidersCommon_SRCS
- Src/FdoCommonNlsUtil.cpp
- Src/FdoCommonOSUtil.cpp
- Src/FdoCommonSchemaUtil.cpp
- Src/FdoCommonStringUtil.cpp
- Src/FdoCommonMiscUtil.cpp
- Src/FdoCommonFile.cpp
- Src/FdoCommonGeometryUtil.cpp
- Src/FdoCommonConnPropDictionary.cpp
- Src/FdoCommonConnStringParser.cpp
- Src/FdoCommonBinaryReader.cpp
- Src/FdoCommonBinaryWriter.cpp
- Src/FdoCommonPropertyIndex.cpp
- Src/FdoCommonThreadMutex.cpp
- Src/FdoCommonThreadUtil.cpp
- Src/stdafx.cpp
- Src/Parse/Lex.cpp
- Src/Parse/Parse.cpp
- Src/FdoDefaultDataReader.cpp
- Src/FdoDefaultFeatureReader.cpp
- Src/FdoDefaultScrollableFeatureReader.cpp
- Src/FdoDefaultSqlDataReader.cpp
+ Src/FdoCommonNlsUtil.cpp
+ Src/FdoCommonOSUtil.cpp
+ Src/FdoCommonSchemaUtil.cpp
+ Src/FdoCommonStringUtil.cpp
+ Src/FdoCommonMiscUtil.cpp
+ Src/FdoCommonFile.cpp
+ Src/FdoCommonGeometryUtil.cpp
+ Src/FdoCommonConnPropDictionary.cpp
+ Src/FdoCommonConnStringParser.cpp
+ Src/FdoCommonBinaryReader.cpp
+ Src/FdoCommonBinaryWriter.cpp
+ Src/FdoCommonPropertyIndex.cpp
+ Src/FdoCommonThreadMutex.cpp
+ Src/FdoCommonThreadUtil.cpp
+ Src/stdafx.cpp
+ Src/Parse/Lex.cpp
+ Src/Parse/Parse.cpp
+ Src/FdoDefaultDataReader.cpp
+ Src/FdoDefaultFeatureReader.cpp
+ Src/FdoDefaultScrollableFeatureReader.cpp
+ Src/FdoDefaultSqlDataReader.cpp
)
if (WIN32)
@@ -42,6 +46,13 @@
add_library( ProvidersCommon STATIC ${ProvidersCommon_SRCS} )
add_dependencies( ProvidersCommon FDO${FDO_VERSION_SUFFIX} FDOMessage )
-target_link_libraries( ProvidersCommon
- FDO${FDO_VERSION_SUFFIX}
-)
+
+if (WIN32)
+ target_link_libraries( ProvidersCommon
+ FDO
+ )
+else (WIN32)
+ target_link_libraries( ProvidersCommon
+ FDO${FDO_VERSION_SUFFIX}
+ )
+endif (WIN32)
Modified: sandbox/vcpkg/Utilities/ExpressionEngine/Src/CMakeLists.txt
===================================================================
--- sandbox/vcpkg/Utilities/ExpressionEngine/Src/CMakeLists.txt 2019-09-30 15:10:25 \
UTC (rev 7869)
+++ sandbox/vcpkg/Utilities/ExpressionEngine/Src/CMakeLists.txt 2019-09-30 15:30:24 \
UTC (rev 7870) @@ -7,6 +7,10 @@
${UTILITIES_COMMON_INCLUDE_DIR}
)
+if (MSVC)
+ add_definitions(-D_UNICODE -D_CRT_SECURE_NO_DEPRECATE \
-DEXPRESSIONENGINE_EXPORTS) +endif (MSVC)
+
set( ExpressionEngine_LIB_SRCS
Functions/Aggregate/CacheValue.cpp
Functions/Aggregate/CacheValueCollection.cpp
@@ -80,12 +84,23 @@
stdafx.cpp
)
-add_library( ExpressionEngine${FDO_VERSION_SUFFIX} SHARED \
${ExpressionEngine_LIB_SRCS} ) +if (WIN32)
+ add_library( ExpressionEngine SHARED ${ExpressionEngine_LIB_SRCS} )
+ target_link_libraries( ExpressionEngine
+ PRIVATE
+ FDO
+ FDOCommon
+ FDOGeometry
+ FDOSpatial
+ ProvidersCommon)
+else (WIN32)
+ add_library( ExpressionEngine${FDO_VERSION_SUFFIX} SHARED \
${ExpressionEngine_LIB_SRCS} )
-target_link_libraries( ExpressionEngine${FDO_VERSION_SUFFIX}
- FDO${FDO_VERSION_SUFFIX}
- ProvidersCommon
-)
+ target_link_libraries( ExpressionEngine${FDO_VERSION_SUFFIX}
+ FDO${FDO_VERSION_SUFFIX}
+ ProvidersCommon
+ )
-install( TARGETS ExpressionEngine${FDO_VERSION_SUFFIX} DESTINATION \
${LIB_INSTALL_DIR} COMPONENT ${FDO_COMPONENT} )
-install_symlink( ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libExpressionEngine${FDO_VERSION_SUFFIX}.so \
libExpressionEngine.so COMPONENT ${FDO_COMPONENT} ) \ No newline at end of file
+ install( TARGETS ExpressionEngine${FDO_VERSION_SUFFIX} DESTINATION \
${LIB_INSTALL_DIR} COMPONENT ${FDO_COMPONENT} ) + install_symlink( \
${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libExpressionEngine${FDO_VERSION_SUFFIX}.so \
libExpressionEngine.so COMPONENT ${FDO_COMPONENT} ) +endif (WIN32)
\ No newline at end of file
Modified: sandbox/vcpkg/Utilities/ExpressionEngine/Src/Util/FdoExpressionEngineUtilDataReader.cpp
===================================================================
--- sandbox/vcpkg/Utilities/ExpressionEngine/Src/Util/FdoExpressionEngineUtilDataReader.cpp 2019-09-30 \
15:10:25 UTC (rev 7869)
+++ sandbox/vcpkg/Utilities/ExpressionEngine/Src/Util/FdoExpressionEngineUtilDataReader.cpp 2019-09-30 \
15:30:24 UTC (rev 7870) @@ -23,6 +23,8 @@
#include <FdoCommonBinaryReader.h>
#include <FdoCommonBinaryWriter.h>
#include <FdoExpressionEngine.h>
+#include <vector>
+#include <algorithm>
#ifdef __GNUC__
//Some pre-processor massaging to get hash_map into stdext
_______________________________________________
fdo-commits mailing list
fdo-commits@lists.osgeo.org
https://lists.osgeo.org/mailman/listinfo/fdo-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic