CMake: Make simdjson-internal-flags subsume simdjson-flags

furkanusta · furkanusta · commit 064eb0b24f72 · 2020-05-03T02:48:29.000+03:00
diff --git a/fuzz/CMakeLists.txt b/fuzz/CMakeLists.txt
@@ -40,7 +40,7 @@ if(ENABLE_FUZZING)
   else ()
     target_link_libraries(simdjson-fuzzer INTERFACE simdjson)
   endif ()
-  target_link_libraries(simdjson-fuzzer INTERFACE simdjson-flags simdjson-internal-flags)
+  target_link_libraries(simdjson-fuzzer INTERFACE simdjson-internal-flags)
   target_link_libraries(simdjson-fuzzer INTERFACE ${SIMDJSON_FUZZ_LDFLAGS})
 
   # Define the fuzzers
diff --git a/simdjson-flags.cmake b/simdjson-flags.cmake
@@ -36,6 +36,8 @@ set(THREADS_PREFER_PTHREAD_FLAG ON)
 #
 add_library(simdjson-flags INTERFACE)
 add_library(simdjson-internal-flags INTERFACE)
+target_link_libraries(simdjson-internal-flags INTERFACE simdjson-flags)
+
 if(MSVC)
   target_compile_options(simdjson-internal-flags INTERFACE /nologo /D_CRT_SECURE_NO_WARNINGS)
   target_compile_options(simdjson-internal-flags INTERFACE /WX /W3 /sdl)
diff --git a/singleheader/CMakeLists.txt b/singleheader/CMakeLists.txt
@@ -93,7 +93,7 @@ add_dependencies(simdjson-singleheader-source amalgamate)
 # Test the generated simdjson.cpp/simdjson.h using the generated amalgamate_demo.cpp
 #
 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 simdjson-flags)
+target_link_libraries(amalgamate_demo simdjson-singleheader-include-source simdjson-internal-flags)
 add_test(amalgamate_demo amalgamate_demo ${EXAMPLE_JSON} ${EXAMPLE_NDJSON})
 
 install(FILES simdjson.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -35,7 +35,7 @@ function(add_cpp_test TEST_NAME)
   endif()
 endfunction()
 # Most tests need test data, and many need windows headers.
-link_libraries(simdjson-flags simdjson-internal-flags test-data simdjson-windows-headers)
+link_libraries(simdjson-internal-flags test-data simdjson-windows-headers)
 
 include(${PROJECT_SOURCE_DIR}/tests/add_cpp_test.cmake)
 
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
@@ -1,4 +1,4 @@
-link_libraries(simdjson simdjson-flags simdjson-internal-flags simdjson-windows-headers)
+link_libraries(simdjson simdjson-internal-flags simdjson-windows-headers)
 
 add_executable(json2json json2json.cpp)
 add_executable(jsonstats jsonstats.cpp)

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,8 @@ set(THREADS_PREFER_PTHREAD_FLAG ON)`
`36`	`36`	`#`
`37`	`37`	`add_library(simdjson-flags INTERFACE)`
`38`	`38`	`add_library(simdjson-internal-flags INTERFACE)`
	`39`	`+target_link_libraries(simdjson-internal-flags INTERFACE simdjson-flags)`
	`40`	`+`
`39`	`41`	`if(MSVC)`
`40`	`42`	`target_compile_options(simdjson-internal-flags INTERFACE /nologo /D_CRT_SECURE_NO_WARNINGS)`
`41`	`43`	`target_compile_options(simdjson-internal-flags INTERFACE /WX /W3 /sdl)`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ add_dependencies(simdjson-singleheader-source amalgamate)`
`93`	`93`	`# Test the generated simdjson.cpp/simdjson.h using the generated amalgamate_demo.cpp`
`94`	`94`	`#`
`95`	`95`	`add_executable(amalgamate_demo $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/amalgamate_demo.cpp>)`
`96`		`-target_link_libraries(amalgamate_demo simdjson-singleheader-include-source simdjson-internal-flags simdjson-flags)`
	`96`	`+target_link_libraries(amalgamate_demo simdjson-singleheader-include-source simdjson-internal-flags)`
`97`	`97`	`add_test(amalgamate_demo amalgamate_demo ${EXAMPLE_JSON} ${EXAMPLE_NDJSON})`
`98`	`98`
`99`	`99`	`install(FILES simdjson.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-link_libraries(simdjson simdjson-flags simdjson-internal-flags simdjson-windows-headers)`
	`1`	`+link_libraries(simdjson simdjson-internal-flags simdjson-windows-headers)`
`2`	`2`
`3`	`3`	`add_executable(json2json json2json.cpp)`
`4`	`4`	`add_executable(jsonstats jsonstats.cpp)`