Compare commits
	
		
			2 Commits
		
	
	
		
			6ba7c82f80
			...
			b20daa1ac2
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| b20daa1ac2 | |||
| b1a18459e7 | 
| @@ -41,7 +41,7 @@ set(LIB_SOURCES | ||||
| 	src/vm/fp_functions.cpp | ||||
|     ${GEN_SOURCES} | ||||
| ) | ||||
| if(TARGET RapidJSON) | ||||
| if(TARGET RapidJSON OR TARGET RapidJSON::RapidJSON) | ||||
|     list(APPEND LIB_SOURCES src/iss/plugin/cycle_estimate.cpp src/iss/plugin/pctrace.cpp) | ||||
| endif() | ||||
|  | ||||
| @@ -73,7 +73,12 @@ elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") | ||||
| endif() | ||||
| target_include_directories(${PROJECT_NAME} PUBLIC src) | ||||
| target_include_directories(${PROJECT_NAME} PUBLIC src-gen) | ||||
| target_link_libraries(${PROJECT_NAME} PUBLIC softfloat scc-util jsoncpp Boost::coroutine) | ||||
| target_link_libraries(${PROJECT_NAME} PUBLIC softfloat scc-util Boost::coroutine) | ||||
| if(TARGET jsoncpp::jsoncpp) | ||||
| 	target_link_libraries(${PROJECT_NAME} PUBLIC jsoncpp::jsoncpp) | ||||
| else() | ||||
| 	target_link_libraries(${PROJECT_NAME} PUBLIC jsoncpp) | ||||
| endif() | ||||
| if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") | ||||
|     target_link_libraries(${PROJECT_NAME} PUBLIC -Wl,--whole-archive dbt-rise-core -Wl,--no-whole-archive) | ||||
| else() | ||||
| @@ -90,7 +95,9 @@ if(TARGET lz4::lz4) | ||||
|     target_compile_definitions(${PROJECT_NAME} PUBLIC WITH_LZ4) | ||||
|     target_link_libraries(${PROJECT_NAME} PUBLIC lz4::lz4) | ||||
| endif() | ||||
| if(TARGET RapidJSON) | ||||
| if(TARGET RapidJSON::RapidJSON) | ||||
|     target_link_libraries(${PROJECT_NAME} PUBLIC RapidJSON::RapidJSON) | ||||
| elseif(TARGET RapidJSON) | ||||
|     target_link_libraries(${PROJECT_NAME} PUBLIC RapidJSON) | ||||
| endif() | ||||
|  | ||||
| @@ -172,7 +179,7 @@ if(SystemC_FOUND) | ||||
|         target_link_libraries(${PROJECT_NAME} PUBLIC ${llvm_libs}) | ||||
|     endif() | ||||
|      | ||||
| 	set(LIB_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/incl/sysc/core_complex.h) | ||||
| 	set(LIB_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/src/sysc/core_complex.h) | ||||
|     set_target_properties(${PROJECT_NAME} PROPERTIES | ||||
|       VERSION ${PROJECT_VERSION} | ||||
|       FRAMEWORK FALSE | ||||
|   | ||||
		Reference in New Issue
	
	Block a user