Support for ORC in Windows

jvxgit · Apr 15, 2024 · 32df556 · 32df556
1 parent 6b8ff44
commit 32df556
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/cmake/common_local_lib_foot.cmake b/cmake/common_local_lib_foot.cmake
@@ -216,7 +216,7 @@ endif()
 if (LOCAL_ORC_SCRIPTS)
   if(JVX_USE_ORC)
     message("    > processing orc files")
-    set(ORCC ${CMAKE_SOURCE_DIR}/sources/jvxLibraries/third_party/git/orc/orc/install/bin/orcc)
+    # set(ORCC ${CMAKE_SOURCE_DIR}/sources/jvxLibraries/third_party/git/orc/orc/install/bin/orcc)
     file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/generated)
     include_directories(${CMAKE_CURRENT_BINARY_DIR}/generated)
     foreach(LOCAL_ORC_SCRIPT ${LOCAL_ORC_SCRIPTS})
@@ -256,16 +256,16 @@ if(BUILD_STATIC)
 
 		message("Build OBJECT Library ${JVX_TARGET_NAME_STATIC}")
 		if(CUDA_SOURCES)
-			add_library(${JVX_TARGET_NAME_STATIC} OBJECT ${LOCAL_SOURCES} ${CUDA_SOURCES} ${ADDITIONAL_SOURCES} ${GENERATED_FILES} ${LOCAL_PCG_FILES} ${PCG_SOURCES} ${LOCAL_MCG_FILES} ${QT_RESOURCES} ${LOCAL_UI_SOURCES})
+			add_library(${JVX_TARGET_NAME_STATIC} OBJECT ${LOCAL_SOURCES} ${CUDA_SOURCES} ${ADDITIONAL_SOURCES} ${GENERATED_FILES} ${LOCAL_PCG_FILES} ${PCG_SOURCES} ${LOCAL_MCG_FILES} ${QT_RESOURCES} ${LOCAL_UI_SOURCES} ${LOCAL_ORC_SCRIPTS})
 		else()
-			add_library(${JVX_TARGET_NAME_STATIC} OBJECT ${LOCAL_SOURCES} ${ADDITIONAL_SOURCES} ${GENERATED_FILES} ${LOCAL_PCG_FILES} ${PCG_SOURCES} ${LOCAL_MCG_FILES} ${QT_RESOURCES} ${LOCAL_UI_SOURCES})
+			add_library(${JVX_TARGET_NAME_STATIC} OBJECT ${LOCAL_SOURCES} ${ADDITIONAL_SOURCES} ${GENERATED_FILES} ${LOCAL_PCG_FILES} ${PCG_SOURCES} ${LOCAL_MCG_FILES} ${QT_RESOURCES} ${LOCAL_UI_SOURCES} ${LOCAL_ORC_SCRIPTS})
 		endif()
 	else()
 		message("Build STATIC Library ${JVX_TARGET_NAME_STATIC}")
 		if(CUDA_SOURCES)
-			add_library(${JVX_TARGET_NAME_STATIC} STATIC ${LOCAL_SOURCES} ${CUDA_SOURCES} ${ADDITIONAL_SOURCES} ${GENERATED_FILES} ${LOCAL_PCG_FILES} ${PCG_SOURCES} ${LOCAL_MCG_FILES} ${QT_RESOURCES} ${LOCAL_UI_SOURCES})
+			add_library(${JVX_TARGET_NAME_STATIC} STATIC ${LOCAL_SOURCES} ${CUDA_SOURCES} ${ADDITIONAL_SOURCES} ${GENERATED_FILES} ${LOCAL_PCG_FILES} ${PCG_SOURCES} ${LOCAL_MCG_FILES} ${QT_RESOURCES} ${LOCAL_UI_SOURCES} ${LOCAL_ORC_SCRIPTS})
 		else()
-			add_library(${JVX_TARGET_NAME_STATIC} STATIC ${LOCAL_SOURCES} ${ADDITIONAL_SOURCES} ${GENERATED_FILES} ${LOCAL_PCG_FILES} ${PCG_SOURCES} ${LOCAL_MCG_FILES} ${QT_RESOURCES} ${LOCAL_UI_SOURCES})
+			add_library(${JVX_TARGET_NAME_STATIC} STATIC ${LOCAL_SOURCES} ${ADDITIONAL_SOURCES} ${GENERATED_FILES} ${LOCAL_PCG_FILES} ${PCG_SOURCES} ${LOCAL_MCG_FILES} ${QT_RESOURCES} ${LOCAL_UI_SOURCES} ${LOCAL_ORC_SCRIPTS})
 		endif()
 	endif()
 
@@ -483,10 +483,10 @@ if(BUILD_SHARED)
 
 	if(CUDA_SOURCES)
 
-      add_library(${LOCAL_TARGET_NAME_SHARED} SHARED ${LOCAL_SOURCES} ${CUDA_SOURCES} ${ADDITIONAL_SOURCES} ${LOCAL_GENERATED_FILES} ${GENERATED_FILES}  ${LOCAL_PCG_FILES} ${PCG_SOURCES} ${LOCAL_MCG_FILES} ${QT_RESOURCES} ${UI_HEADERS})
+      add_library(${LOCAL_TARGET_NAME_SHARED} SHARED ${LOCAL_SOURCES} ${CUDA_SOURCES} ${ADDITIONAL_SOURCES} ${LOCAL_GENERATED_FILES} ${GENERATED_FILES}  ${LOCAL_PCG_FILES} ${PCG_SOURCES} ${LOCAL_MCG_FILES} ${QT_RESOURCES} ${UI_HEADERS} ${LOCAL_ORC_SCRIPTS})
 
     else()
-      add_library(${LOCAL_TARGET_NAME_SHARED} SHARED ${LOCAL_SOURCES} ${ADDITIONAL_SOURCES} ${LOCAL_GENERATED_FILES} ${GENERATED_FILES}  ${LOCAL_PCG_FILES} ${PCG_SOURCES} ${LOCAL_MCG_FILES} ${QT_RESOURCES} ${UI_HEADERS})
+      add_library(${LOCAL_TARGET_NAME_SHARED} SHARED ${LOCAL_SOURCES} ${ADDITIONAL_SOURCES} ${LOCAL_GENERATED_FILES} ${GENERATED_FILES}  ${LOCAL_PCG_FILES} ${PCG_SOURCES} ${LOCAL_MCG_FILES} ${QT_RESOURCES} ${UI_HEADERS} ${LOCAL_ORC_SCRIPTS})
     endif()
 
 	if(MSVC)

diff --git a/sources/sub-projects/ayfstarter/sources/Libraries/ayfstarterlib/CMakeLists.txt b/sources/sub-projects/ayfstarter/sources/Libraries/ayfstarterlib/CMakeLists.txt
@@ -52,4 +52,9 @@ include(${JVX_CMAKE_DIR}/common_local_lib_foot.cmake)
 set(JVX_TARGET_NAME ${PROJECT_NAME}tp_static)
 set(JVX_TARGET_NAME_STATIC ${PROJECT_NAME}tp_static)
 set(LOCAL_COMPILE_DEFINITIONS "${LOCAL_COMPILE_DEFINITIONS};JVX_ALLOW_PROFILER_DATA_MACROS")
+
+if(ORC_DLL_INSTALLER_TARGET)
+    jvx_install_dedicated_file(${ORC_DLL_INSTALLER_TARGET} ${INSTALL_PATH_BIN})
+endif()
+
 include(${JVX_CMAKE_DIR}/common_local_lib_foot.cmake)