Merge branch 'develop' of https://git.minres.com/TGFS/TGC-ISS into develop

adds asmjit
2023-10-22 15:10:22 +02:00 · 2023-10-22 15:10:17 +02:00
1 changed files with 4 additions and 1 deletions
@@ -97,7 +97,10 @@ if(CMAKE_PROJECT_NAME STREQUAL "TGC-ISS")
 	    list(APPEND CONAN_PACKAGE_LIST llvm-core/13.0.0)
 		list(APPEND CONAN_PACKAGE_OPTIONS libiconv:shared=True)
 	endif()
-	
+	if(WITH_ASMJIT)
+	    list(APPEND CONAN_PACKAGE_LIST asmjit/cci.20230325)
+		list(APPEND CONAN_PACKAGE_OPTIONS asmjit:shared=False)
+	endif()
 	if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dbt-rise-plugins)
 	     list(APPEND CONAN_PACKAGE_OPTIONS lua:compile_as_cpp=False)
 	     list(APPEND CONAN_PACKAGE_LIST lua/5.4.3)
Author	SHA1	Message	Date
alex	edb8c6ef5b	Merge branch 'develop' of https://git.minres.com/TGFS/TGC-ISS into develop	2023-10-22 15:10:22 +02:00
alex	9fa17e41e5	adds asmjit	2023-10-22 15:10:17 +02:00