-

Author: Khalyutin

CMakeLists.txt

@@ -371,10 +371,6 @@ crosscompile_prebuild_steps()
 include_directories("extern/re2")
 include_directories("extern/boost")
 
-if(BUILD_LIBTOM)
-    include_directories("extern/libtommath")
-    include_directories("extern/libtomcrypt/src/headers")
-endif()
 
 include_directories("extern/decNumber")
 include_directories("extern/icu/include")
@@ -439,11 +435,31 @@ if(BUILD_LIBTOM)
 ########################################
 # LIBRARY libtommath
 ########################################
+    set(libtommath_ID   tommath)
 
-file(GLOB libtommath_src "extern/libtommath/*.c" "extern/libtommath/*.h")
+if (LIBTOMMATH_VER)
+    set(LIBTOMMATH_DIR "extern/libtommath-${LIBTOMMATH_VER}")
+else()
+    set(LIBTOMMATH_DIR "extern/libtommath")
+endif()    
+include_directories("${LIBTOMMATH_DIR}")
+
+    # # test build vith MSVS
+    # d: && cd d:/source/COMPONENTS/SQLfb/code/extern/libtommath-1.2
+    # "c:/Program Files/Microsoft Visual Studio/18/Community/MSBuild/Current/Bin/MSBuild.exe" libtommath_MSVC15.sln /p:Configuration=Release /t:Rebuild /p:Platform=x64            
+    # execute_process(COMMAND 
+    # ${CMAKE_VS_MSBUILD_COMMAND} ${LIBTOMMATH_DIR}/libtommath_MSVC15.sln 
+    # /p:Configuration=Release /t:Rebuild
+    # /p:Platform=x64            
+    # WORKING_DIRECTORY ${LIBTOMMATH_DIR})
+    # file(COPY "${LIBTOMMATH_DIR}/lib/x64/Release/" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
+    # set(libtommath_ID   tommath)
+    # #
+
+    file(GLOB libtommath_src "${LIBTOMMATH_DIR}/*.c" "${LIBTOMMATH_DIR}/*.h")
+    add_library               (${libtommath_ID} ${libtommath_src})
+    project_group             (${libtommath_ID} Extern)
 
-add_library               (${libtommath_ID} ${libtommath_src})
-project_group             (${libtommath_ID} Extern)
 
 if (WIN32 AND USE_TTMATH_MASM)
     add_custom_command(TARGET ${libtommath_ID} PRE_BUILD  
@@ -453,18 +469,19 @@ if (WIN32 AND USE_TTMATH_MASM)
               "${CMAKE_CURRENT_SOURCE_DIR}/extern/ttmath/ttmathuint_x86_64_msvc.asm"
     )
     set(libtommath_x86_64_masm_obj  "${CMAKE_CURRENT_BINARY_DIR}/ttmathuint_x86_64_msvc.obj")
+    target_link_libraries     (${libtommath_ID} ${LIB_builtins_Clang} ${libtommath_x86_64_masm_obj})
     message("use TTMATH MASM")
 else()
     message("not use TTMATH MASM")
     add_definitions("-DTTMATH_NOASM")
 endif()                             
 
-target_link_libraries     (${libtommath_ID} ${LIB_builtins_Clang} ${libtommath_x86_64_masm_obj})
-
 ########################################
 # LIBRARY libtomcrypt
 ########################################
 
+set(libtomcrypt_ID tomcrypt)
+
 file(GLOB_RECURSE libtomcrypt_src "extern/libtomcrypt/src/*")
 list(FILTER libtomcrypt_src EXCLUDE REGEX ".*aes_tab.c")
 list(FILTER libtomcrypt_src EXCLUDE REGEX ".*whirltab.c")
@@ -474,6 +491,7 @@ add_library                 (${libtomcrypt_ID} ${libtomcrypt_src})
 target_compile_definitions  (${libtomcrypt_ID} PRIVATE LTC_NO_ROLC LTC_SOURCE)
 target_link_libraries       (${libtomcrypt_ID} ${libtommath_ID})
 project_group               (${libtomcrypt_ID} Extern)
+include_directories("extern/libtomcrypt/src/headers")
 
 endif()
 

builds/cmake/BuildICU.cmake

@@ -120,9 +120,7 @@ function(build_icu4c ICU_VER)
         if (WIN32)
 
             # file(COPY  mh-unknown "${ICU_DIR}/ICU/icu/source/config/mh-unknown")
-
-            set(CMAKE_VS_MSBUILD_COMMAND "c:/Program Files/Microsoft Visual Studio/18/Community/MSBuild/Current/Bin/MSBuild.exe")
-
+            
             execute_process(COMMAND 
                 ${CMAKE_VS_MSBUILD_COMMAND} icu/source/allinone/allinone.sln 
                 /p:Configuration=Release /t:Rebuild

src/CMakeLists.txt

@@ -161,8 +161,8 @@ add_custom_command(
         msg_fdb
     #
     COMMAND ${CMAKE_COMMAND} -E remove firebird.msg
-    COMMAND ${BUILD_MSG_CMD} -D msg.fdb -P ${CMAKE_CURRENT_BINARY_DIR}/ -F firebird.msg -L all
-    COMMAND ${BUILD_MSG_CMD} -D msg.fdb -P ${CMAKE_CURRENT_BINARY_DIR}/ -F firebird.msg
+    COMMAND ${BUILD_MSG_CMD} -F ${CMAKE_CURRENT_BINARY_DIR}/firebird.msg 
+    # COMMAND ${BUILD_MSG_CMD} -D msg.fdb -P ${CMAKE_CURRENT_BINARY_DIR}/ -F firebird.msg
     COMMAND ${CMAKE_COMMAND} -E copy_if_different firebird.msg ${output_dir}/firebird.msg
 )
 # add_custom_command(
@@ -177,8 +177,8 @@ add_custom_command(
 #     COMMAND ${CODES_CMD} ${CMAKE_CURRENT_SOURCE_DIR}/include/gen ${CMAKE_CURRENT_SOURCE_DIR}/../lang_helpers
 # )
 # add_custom_target(messages ALL DEPENDS firebird.msg codes_headers.dummy)
-# add_custom_target(messages ALL DEPENDS firebird.msg)
-# project_group(messages "Boot/Custom build steps")
+add_custom_target(messages ALL DEPENDS firebird.msg)
+project_group(messages "Boot/Custom build steps")
 
 
 ########################################

src/remote/CMakeLists.txt

@@ -53,7 +53,7 @@ add_src_win32(fbserver_src
     server/os/win32/server.ico
     server/os/win32/caution.ico
     server/os/win32/window.rc
-    server/ReplServer.cpp
+    # server/ReplServer.cpp
     server/server.cpp
 )
 add_src_unix(fbserver_src