diff options
| author | Arseny Kapoulkine <arseny.kapoulkine@gmail.com> | 2021-08-07 09:51:54 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-07 09:51:54 -0700 |
| commit | c624c7a8bda7e879669f9f490302ed0392855139 (patch) | |
| tree | 647384041a56464c51b756d2b31c3b518ecd85ad /CMakeLists.txt | |
| parent | e7eae035ff55553d2e901dc17a963ca5120c0098 (diff) | |
| download | pugixml-c624c7a8bda7e879669f9f490302ed0392855139.zip pugixml-c624c7a8bda7e879669f9f490302ed0392855139.tar.gz pugixml-c624c7a8bda7e879669f9f490302ed0392855139.tar.bz2 | |
Update CMakeLists.txt
Remove memory configuration options and rely on automatic detection of long long
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6fb09a6..db2f10e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,9 +5,6 @@ include(CMakePackageConfigHelpers) include(CMakeDependentOption) include(GNUInstallDirs) include(CTest) -include(CheckTypeSize) - -check_type_size("long long" LONG_LONG LANGUAGE CXX) cmake_dependent_option(PUGIXML_USE_VERSIONED_LIBDIR "Use a private subdirectory to install the headers and libraries" OFF @@ -48,19 +45,12 @@ option(PUGIXML_NO_EXCEPTIONS "Disable Exceptions" OFF) mark_as_advanced(PUGIXML_NO_XPATH PUGIXML_NO_STL PUGIXML_NO_EXCEPTIONS) set(PUGIXML_PUBLIC_DEFINITIONS - $<$<BOOL:${HAVE_LONG_LONG}>:PUGIXML_HAS_LONG_LONG> $<$<BOOL:${PUGIXML_WCHAR_MODE}>:PUGIXML_WCHAR_MODE> $<$<BOOL:${PUGIXML_COMPACT}>:PUGIXML_COMPACT> $<$<BOOL:${PUGIXML_NO_XPATH}>:PUGIXML_NO_XPATH> $<$<BOOL:${PUGIXML_NO_STL}>:PUGIXML_NO_STL> $<$<BOOL:${PUGIXML_NO_EXCEPTIONS}>:PUGIXML_NO_EXCEPTIONS>) -set(PUGIXML_PRIVATE_DEFINITIONS - $<$<BOOL:${PUGIXML_MEMORY_PAGE_SIZE}>:PUGIXML_MEMORY_PAGE_SIZE=${PUGIXML_MEMORY_PAGE_SIZE}> - $<$<BOOL:${PUGIXML_MEMORY_OUTPUT_STACK}>:PUGIXML_MEMORY_OUTPUT_STACK=${PUGIXML_MEMORY_OUTPUT_STACK}> - $<$<BOOL:${PUGIXML_MEMORY_XPATH_PAGE_SIZE}>:PUGIXML_MEMORY_XPATH_PAGE_SIZE=${PUGIXML_MEMORY_XPATH_PAGE_SIZE}> - $<$<BOOL:${PUGIXML_XPATH_DEPTH_LIMIT}>:PUGIXML_XPATH_DEPTH_LIMIT=${PUGIXML_XPATH_DEPTH_LIMIT}>) - # This is used to backport a CMake 3.15 feature, but is also forwards compatible if (NOT DEFINED CMAKE_MSVC_RUNTIME_LIBRARY) set(CMAKE_MSVC_RUNTIME_LIBRARY @@ -116,8 +106,7 @@ if (BUILD_SHARED_LIBS) ${PUGIXML_BUILD_DEFINES} ${PUGIXML_PUBLIC_DEFINITIONS} PRIVATE - $<$<CXX_COMPILER_ID:MSVC>:PUGIXML_API=__declspec\(dllexport\)> - ${PUGIXML_PRIVATE_DEFINITIONS}) + $<$<CXX_COMPILER_ID:MSVC>:PUGIXML_API=__declspec\(dllexport\)>) target_compile_options(pugixml-shared PRIVATE ${msvc-rt-mtd-shared} @@ -139,9 +128,7 @@ if (NOT BUILD_SHARED_LIBS OR PUGIXML_BUILD_SHARED_AND_STATIC_LIBS) target_compile_definitions(pugixml-static PUBLIC ${PUGIXML_BUILD_DEFINES} - ${PUGIXML_PUBLIC_DEFINITIONS} - PRIVATE - ${PUGIXML_PRIVATE_DEFINITIONS}) + ${PUGIXML_PUBLIC_DEFINITIONS}) target_compile_options(pugixml-static PRIVATE ${msvc-rt-mtd-shared} |