Put cpp_rule_preprocessor in cmakelists

Author: lucic71

.gitignore

@@ -25,5 +25,5 @@ tmp
 *.LOCAL.*
 *.REMOTE.*
 
-# Integration tests
-tests/cpp2rust-tests/
+# Generated by cpp-rule-preprocessor at build time.
+rules/*/ir_src.json

CMakeLists.txt

@@ -142,10 +142,12 @@ add_custom_target("check-rules"
                           ${CMAKE_COMMAND} -E env
                               CARGO_TARGET_DIR=${PROJECT_SOURCE_DIR}/rule-preprocessor/target
                               cargo run
+                  COMMAND $<TARGET_FILE:cpp-rule-preprocessor>
+                              --rules ${PROJECT_SOURCE_DIR}/rules
                   COMMAND ${CMAKE_COMMAND} -E chdir ${PROJECT_SOURCE_DIR}
                           git diff --exit-code -- rules/
                   WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/rules"
-                  DEPENDS install-rust-toolchain
+                  DEPENDS install-rust-toolchain cpp-rule-preprocessor
                   USES_TERMINAL
                  )
 

cpp2rust/CMakeLists.txt

@@ -1,7 +1,12 @@
-file(GLOB_RECURSE SOURCES "*.cpp")
-add_clang_executable(cpp2rust ${SOURCES})
+file(GLOB_RECURSE CORE_SOURCES "*.cpp")
+list(REMOVE_ITEM CORE_SOURCES
+    "${CMAKE_CURRENT_SOURCE_DIR}/cpp2rust.cpp"
+    "${CMAKE_CURRENT_SOURCE_DIR}/cpp_rule_preprocessor.cpp"
+)
+
+add_library(cpp2rust_core STATIC ${CORE_SOURCES})
 
-target_link_libraries(cpp2rust PRIVATE
+target_link_libraries(cpp2rust_core PUBLIC
     clangAST
     clangASTMatchers
     clangBasic
@@ -10,22 +15,28 @@ target_link_libraries(cpp2rust PRIVATE
     clangSerialization
     clangTooling
 )
-target_include_directories(cpp2rust PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-target_include_directories(cpp2rust PUBLIC SYSTEM ${CLANG_INCLUDE_DIRS} ${LLVM_INCLUDE_DIRS})
-target_compile_definitions(cpp2rust PUBLIC ${LLVM_DEFINITIONS})
-target_compile_definitions(cpp2rust PUBLIC "-DCLANG_C_COMPILER=\"${CMAKE_C_COMPILER}\"")
-target_compile_definitions(cpp2rust PUBLIC "-DCLANG_CXX_COMPILER=\"${CMAKE_CXX_COMPILER}\"")
-target_compile_definitions(cpp2rust PUBLIC "-DCLANG_RESOURCE_DIR=\"${LLVM_LIBRARY_DIR}/clang/${LLVM_VERSION_MAJOR}\"")
-target_compile_definitions(cpp2rust PUBLIC "-DCOMPAT_INCLUDE_DIR=\"${CMAKE_CURRENT_SOURCE_DIR}/compat\"")
+target_include_directories(cpp2rust_core PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+target_include_directories(cpp2rust_core SYSTEM PUBLIC ${CLANG_INCLUDE_DIRS} ${LLVM_INCLUDE_DIRS})
+target_compile_definitions(cpp2rust_core PUBLIC ${LLVM_DEFINITIONS})
+target_compile_definitions(cpp2rust_core PUBLIC "-DCLANG_C_COMPILER=\"${CMAKE_C_COMPILER}\"")
+target_compile_definitions(cpp2rust_core PUBLIC "-DCLANG_CXX_COMPILER=\"${CMAKE_CXX_COMPILER}\"")
+target_compile_definitions(cpp2rust_core PUBLIC "-DCLANG_RESOURCE_DIR=\"${LLVM_LIBRARY_DIR}/clang/${LLVM_VERSION_MAJOR}\"")
+target_compile_definitions(cpp2rust_core PUBLIC "-DCOMPAT_INCLUDE_DIR=\"${CMAKE_CURRENT_SOURCE_DIR}/compat\"")
 
 if (APPLE)
   execute_process(
     COMMAND xcrun --show-sdk-path
     OUTPUT_VARIABLE MACOS_SDK_PATH
     OUTPUT_STRIP_TRAILING_WHITESPACE
   )
-  target_compile_definitions(cpp2rust PUBLIC "-DMACOS_SDK_PATH=\"${MACOS_SDK_PATH}\"")
+  target_compile_definitions(cpp2rust_core PUBLIC "-DMACOS_SDK_PATH=\"${MACOS_SDK_PATH}\"")
 endif()
 
 llvm_map_components_to_libnames(llvm_libs support)
-target_link_libraries(cpp2rust PRIVATE ${llvm_libs})
+target_link_libraries(cpp2rust_core PUBLIC ${llvm_libs})
+
+add_clang_executable(cpp2rust PARTIAL_SOURCES_INTENDED cpp2rust.cpp)
+target_link_libraries(cpp2rust PRIVATE cpp2rust_core)
+
+add_clang_executable(cpp-rule-preprocessor PARTIAL_SOURCES_INTENDED cpp_rule_preprocessor.cpp)
+target_link_libraries(cpp-rule-preprocessor PRIVATE cpp2rust_core)