[Build][CMAKE] Fix FTBFS with USE_COMMON_DEVICE_LIB != "Yes".Partly working with...

[csp-qt/common_source_project-fm7.git] / source / build-cmake / cmake / config_commonsource.cmake

diff --git a/source/build-cmake/cmake/config_commonsource.cmake b/source/build-cmake/cmake/config_commonsource.cmake
index 88d3002..38bb743 100644 (file)
--- a/source/build-cmake/cmake/config_commonsource.cmake
+++ b/source/build-cmake/cmake/config_commonsource.cmake
@@ -6,8 +6,9 @@
 include(CheckFunctionExists)
 
 if(USE_DEVICES_SHARED_LIB)
-  #add_definitions(-DUSE_DEVICES_SHARED_LIB)
   add_definitions(-DUSE_SHARED_DLL)
+  add_definitions(-DUSE_SHARED_UI_DLL)
+  add_definitions(-DUSE_SHARED_DEVICES_DLL)
   set(I386_CPPS
        libcpu_newdev/i386.cpp
        libcpu_newdev/libcpu_i386/i386_real.cpp
@@ -241,7 +242,14 @@ if(DEFINED VM_NAME)
 # else()
 #   set(DEBUG_LIBS)
 # endif()
-
+       if(USE_DEVICES_SHARED_LIB)
+       else()
+         if(USE_FMGEN)
+               set(VM_APPEND_LIBS fmgen${VM_APPEND_LIBS})
+         else()
+               set(VM_APPEND_LIBS ${VM_APPEND_LIBS})
+         endif()
+       endif()
        if(WIN32)
           set(LOCAL_LIBS     
                   common_emu
@@ -295,7 +303,11 @@ else()
 #       ${LIBAV_LIBRARIES}
        ${ADDITIONAL_LIBRARIES}
        )
-       set(BUNDLE_LIBS ${BUNDLE_LIBS} -lCSPosd -lCSPcommon_vm -lCSPfmgen -lCSPgui -lCSPemu_utils -lCSPavio)
+       if(USE_DEVICES_SHARED_LIB)
+               set(BUNDLE_LIBS ${BUNDLE_LIBS} -lCSPosd -lCSPcommon_vm -lCSPfmgen -lCSPgui -lCSPemu_utils -lCSPavio)
+       else()
+               set(BUNDLE_LIBS ${BUNDLE_LIBS} -lCSPosd -lCSPgui -lCSPavio)
+       endif()  
 endif()
 
 if(USE_QT_5)
@@ -305,10 +317,18 @@ endif()
 set(BUNDLE_LIBS ${BUNDLE_LIBS} ${THREADS_LIBRARY})
 
 if(DEFINED VM_NAME)
-       add_subdirectory(../../src/vm/${VM_NAME} vm/${VM_NAME})
-#  if(USE_FMGEN)
-#      add_subdirectory(../../src/vm/fmgen vm/fmgen)
-#  endif()     
-       add_subdirectory(../../src/qt/machines/${VM_NAME} qt/${VM_NAME})
-       add_subdirectory(../../src/qt/common qt/common)
+       if(USE_DEVICES_SHARED_LIB)
+               add_subdirectory(../../src/vm/${VM_NAME} vm/${VM_NAME})
+               add_subdirectory(../../src/qt/machines/${VM_NAME} qt/${VM_NAME})
+               add_subdirectory(../../src/qt/common qt/common)
+         else()
+               add_subdirectory(../../src/vm/${VM_NAME} vm/${VM_NAME})
+               #add_subdirectory(../../src/vm vm/common)
+               #add_subdirectory(../../src common/common)
+               if(USE_FMGEN)
+                       add_subdirectory(../../src/vm/fmgen vm/fmgen)
+               endif() 
+               add_subdirectory(../../src/qt/machines/${VM_NAME} qt/${VM_NAME})
+               add_subdirectory(../../src/qt/common qt/common)
+       endif() 
 endif()