|
From: <ego...@us...> - 2015-05-28 13:27:14
|
Revision: 61629
http://sourceforge.net/p/firebird/code/61629
Author: egorpugin
Date: 2015-05-28 13:27:11 +0000 (Thu, 28 May 2015)
Log Message:
-----------
[build][cmake] Fix mingw build: removed unix prefixes from output libraries.
Modified Paths:
--------------
firebird/trunk/CMakeLists.txt
firebird/trunk/builds/cmake/BuildFunctions.cmake
firebird/trunk/src/CMakeLists.txt
Modified: firebird/trunk/CMakeLists.txt
===================================================================
--- firebird/trunk/CMakeLists.txt 2015-05-28 12:34:33 UTC (rev 61628)
+++ firebird/trunk/CMakeLists.txt 2015-05-28 13:27:11 UTC (rev 61629)
@@ -199,6 +199,11 @@
endif(WIN32)
if (MINGW)
+ # clear unix-style prefixes
+ set(CMAKE_SHARED_LIBRARY_PREFIX)
+ set(CMAKE_SHARED_MODULE_PREFIX)
+ set(CMAKE_STATIC_LIBRARY_PREFIX)
+
add_definitions(-D_WIN32_WINNT=0x0600)
endif()
Modified: firebird/trunk/builds/cmake/BuildFunctions.cmake
===================================================================
--- firebird/trunk/builds/cmake/BuildFunctions.cmake 2015-05-28 12:34:33 UTC (rev 61628)
+++ firebird/trunk/builds/cmake/BuildFunctions.cmake 2015-05-28 13:27:11 UTC (rev 61629)
@@ -108,7 +108,7 @@
set(dir ${dir}/${file}.d)
add_custom_command(
OUTPUT ${out}
- DEPENDS databases ${in}
+ DEPENDS databases boot_gpre ${in}
COMMENT "Calling GPRE master for ${F}"
#
COMMAND ${CMAKE_COMMAND} -E make_directory ${dir}
Modified: firebird/trunk/src/CMakeLists.txt
===================================================================
--- firebird/trunk/src/CMakeLists.txt 2015-05-28 12:34:33 UTC (rev 61628)
+++ firebird/trunk/src/CMakeLists.txt 2015-05-28 13:27:11 UTC (rev 61629)
@@ -1000,12 +1000,22 @@
endforeach()
if (WIN32)
+ set(fbclient_lib_src $<CONFIG>/fbclient.lib)
+ set(fbclient_lib_dst fbclient_ms.lib)
+ set( ib_util_lib_src $<CONFIG>/ib_util.lib)
+ set( ib_util_lib_dst ib_util_ms.lib)
+ if (MINGW)
+ set(fbclient_lib_src libfbclient.dll.a)
+ set(fbclient_lib_dst libfbclient.dll.a)
+ set( ib_util_lib_src libib_util.dll.a)
+ set( ib_util_lib_dst libib_util.dll.a)
+ endif()
add_custom_command(
TARGET copy_files
POST_BUILD
# lib
- COMMAND ${CMAKE_COMMAND} -E copy_if_different $<CONFIG>/fbclient.lib ${output_dir}/lib/fbclient_ms.lib
- COMMAND ${CMAKE_COMMAND} -E copy_if_different $<CONFIG>/ib_util.lib ${output_dir}/lib/ib_util_ms.lib
+ COMMAND ${CMAKE_COMMAND} -E copy_if_different ${fbclient_lib_src} ${output_dir}/lib/${fbclient_lib_dst}
+ COMMAND ${CMAKE_COMMAND} -E copy_if_different ${ib_util_lib_src} ${output_dir}/lib/${ib_util_lib_dst}
# installers
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/builds/install/arch-specific/win32/install_classic.bat ${output_dir}/install_classic.bat
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/builds/install/arch-specific/win32/install_super.bat ${output_dir}/install_super.bat
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|