removes simdjson.cpp include from the amalgated demo (#2119)

Co-authored-by: Daniel Lemire <dlemire@lemire.me>

dependencies/CMakeLists.txt

@@ -104,7 +104,11 @@ int main() {}
   target_compile_definitions(rapidjson INTERFACE RAPIDJSON_HAS_STDSTRING)
   target_include_directories(rapidjson SYSTEM INTERFACE
           "${rapidjson_SOURCE_DIR}/include")
-  target_compile_definitions(rapidjson INTERFACE SIMDJSON_COMPETITION_RAPIDJSON)
+  if (CMAKE_COMPILER_IS_GNUCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 14)
+    message(STATUS "Disabling rapidjson")
+  else()
+    target_compile_definitions(rapidjson INTERFACE SIMDJSON_COMPETITION_RAPIDJSON)
+  endif()
 
   import_dependency(sajson chadaustin/sajson 2dcfd35)
   add_library(sajson INTERFACE)

singleheader/CMakeLists.txt

@@ -123,7 +123,10 @@ include(${PROJECT_SOURCE_DIR}/cmake/add_compile_only_test.cmake)
 # Under Windows you should not mix static and dynamic. Pick one. The following test is static.
 if(NOT SIMDJSON_LEGACY_VISUAL_STUDIO AND NOT SIMDJSON_WINDOWS_DLL)
   add_executable(amalgamate_demo $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/amalgamate_demo.cpp>)
-  target_link_libraries(amalgamate_demo simdjson-singleheader-include-source simdjson-internal-flags)
+  add_library(amalgamate_demo_simdjson $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/simdjson.cpp>)
+  target_link_libraries(amalgamate_demo amalgamate_demo_simdjson simdjson-internal-flags)
+  target_include_directories(amalgamate_demo_simdjson PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>)
+  target_include_directories(amalgamate_demo PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>)
   add_test(amalgamate_demo amalgamate_demo ${EXAMPLE_JSON} ${EXAMPLE_NDJSON})
   set_property(TEST amalgamate_demo APPEND PROPERTY LABELS per_implementation singleheader)
   add_dependencies(singleheader_tests amalgamate_demo)
@@ -164,7 +167,8 @@ if (NOT (${CMAKE_CURRENT_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_BINARY_DIR}))
   # breaks. Simply put: under Windows you should not mix static and dynamic. Pick one.
   if(NOT SIMDJSON_LEGACY_VISUAL_STUDIO AND NOT SIMDJSON_WINDOWS_DLL)
     add_executable(amalgamate_demo_direct_from_repository ${CMAKE_CURRENT_SOURCE_DIR}/amalgamate_demo.cpp)
-    target_link_libraries(amalgamate_demo_direct_from_repository simdjson-singleheader-include-source-direct-from-repository simdjson-internal-flags)
+    add_library(amalgamate_demo_direct_from_repository_simdjson ${CMAKE_CURRENT_SOURCE_DIR}/simdjson.cpp)
+    target_link_libraries(amalgamate_demo_direct_from_repository amalgamate_demo_direct_from_repository_simdjson simdjson-singleheader-include-source-direct-from-repository simdjson-internal-flags)
     add_test(amalgamate_demo_direct_from_repository amalgamate_demo_direct_from_repository ${EXAMPLE_JSON} ${EXAMPLE_NDJSON})
     set_property(TEST amalgamate_demo_direct_from_repository APPEND PROPERTY LABELS per_implementation singleheader)
     add_dependencies(singleheader_tests amalgamate_demo_direct_from_repository)

singleheader/README.md

@@ -1,4 +1,4 @@
 Try :
 ```
-c++ -O3 -std=c++17 -pthread -o amalgamate_demo amalgamate_demo.cpp  && ./amalgamate_demo ../jsonexamples/twitter.json ../jsonexamples/amazon_cellphones.ndjson
+c++ -O3 -std=c++17 -pthread -o amalgamate_demo amalgamate_demo.cpp simdjson.cpp  && ./amalgamate_demo ../jsonexamples/twitter.json ../jsonexamples/amazon_cellphones.ndjson
 

singleheader/amalgamate.py

@@ -39,7 +39,7 @@ else:
 RelativeRoot = str # Literal['src','include'] # Literal not supported in Python 3.7 (CI)
 RELATIVE_ROOTS: List[RelativeRoot] = ['src', 'include' ]
 Implementation = str # Literal['arm64', 'fallback', 'haswell', 'icelake', 'ppc64', 'westmere'] # Literal not supported in Python 3.7 (CI)
-IMPLEMENTATIONS: List[Implementation] = [ 'arm64', 'fallback', 'haswell', 'icelake', 'ppc64', 'westmere' ]
+IMPLEMENTATIONS: List[Implementation] = [ 'arm64', 'haswell', 'icelake', 'ppc64', 'westmere', 'fallback' ]
 GENERIC_INCLUDE = "simdjson/generic"
 GENERIC_SRC = "generic"
 BUILTIN = "simdjson/builtin"

singleheader/amalgamate_demo.cpp

@@ -1,4 +1,3 @@
-#include "simdjson.cpp"
 #include "simdjson.h"
 #include <iostream>
 

singleheader/simdjson.h

@@ -1,4 +1,4 @@
-/* auto-generated on 2024-01-28 12:42:59 -0500. Do not edit! */
+/* auto-generated on 2024-01-31 14:30:44 -0500. Do not edit! */
 /* including simdjson.h:  */
 /* begin file simdjson.h */
 #ifndef SIMDJSON_H

src/simdjson.cpp

@@ -23,9 +23,6 @@ SIMDJSON_PUSH_DISABLE_UNUSED_WARNINGS
 #if SIMDJSON_IMPLEMENTATION_ARM64
 #include <arm64.cpp>
 #endif
-#if SIMDJSON_IMPLEMENTATION_FALLBACK
-#include <fallback.cpp>
-#endif
 #if SIMDJSON_IMPLEMENTATION_HASWELL
 #include <haswell.cpp>
 #endif
@@ -38,7 +35,9 @@ SIMDJSON_PUSH_DISABLE_UNUSED_WARNINGS
 #if SIMDJSON_IMPLEMENTATION_WESTMERE
 #include <westmere.cpp>
 #endif
-
+#if SIMDJSON_IMPLEMENTATION_FALLBACK
+#include <fallback.cpp>
+#endif
 #undef SIMDJSON_CONDITIONAL_INCLUDE
 
 SIMDJSON_POP_DISABLE_UNUSED_WARNINGS