[Firebird-checkins] SF.net SVN: firebird:[60563] firebird/trunk

[<ego...@us...>]

Revision: 60563
          http://sourceforge.net/p/firebird/code/60563
Author:   egorpugin
Date:     2015-01-26 15:23:27 +0000 (Mon, 26 Jan 2015)
Log Message:
-----------
[build] [cmake] Update build according to the last changes.

Modified Paths:
--------------
    firebird/trunk/CMakeLists.txt
    firebird/trunk/builds/cmake/BuildFunctions.cmake
    firebird/trunk/examples/CMakeLists.txt
    firebird/trunk/src/CMakeLists.txt

Modified: firebird/trunk/CMakeLists.txt
===================================================================
--- firebird/trunk/CMakeLists.txt	2015-01-26 15:00:31 UTC (rev 60562)
+++ firebird/trunk/CMakeLists.txt	2015-01-26 15:23:27 UTC (rev 60563)
@@ -238,8 +238,9 @@
 
 if (NOT CMAKE_CROSSCOMPILING)
 
-add_executable      (btyacc ${btyacc_src})
-project_group       (btyacc Extern)
+add_executable          (btyacc ${btyacc_src})
+project_group           (btyacc Extern)
+set_output_directory    (btyacc . FORCE)
 
 endif() # if (NOT CMAKE_CROSSCOMPILING)
 
@@ -250,8 +251,8 @@
 
 file(GLOB libtommath_src "extern/libtommath/*.c" "extern/libtommath/*.h")
 
-add_library     (libtommath ${libtommath_src})
-project_group   (libtommath Extern)
+add_library             (libtommath ${libtommath_src})
+project_group           (libtommath Extern)
 
 ########################################
 

Modified: firebird/trunk/builds/cmake/BuildFunctions.cmake
===================================================================
--- firebird/trunk/builds/cmake/BuildFunctions.cmake	2015-01-26 15:00:31 UTC (rev 60562)
+++ firebird/trunk/builds/cmake/BuildFunctions.cmake	2015-01-26 15:23:27 UTC (rev 60563)
@@ -136,7 +136,7 @@
 #######################################
 function(set_win32 var)
     if (WIN32)
-        set(${var} ${ARGN} PARENT_SCOPE)
+        set(${var} "${ARGN}" PARENT_SCOPE)
     endif()
 endfunction(set_win32)
 
@@ -145,7 +145,7 @@
 #######################################
 function(set_unix var)
     if (UNIX)
-        set(${var} ${ARGN} PARENT_SCOPE)
+        set(${var} "${ARGN}" PARENT_SCOPE)
     endif()
 endfunction(set_unix)
 
@@ -154,7 +154,7 @@
 #######################################
 function(set_apple var)
     if (APPLE)
-        set(${var} ${ARGN} PARENT_SCOPE)
+        set(${var} "${ARGN}" PARENT_SCOPE)
     endif()
 endfunction(set_apple)
 

Modified: firebird/trunk/examples/CMakeLists.txt
===================================================================
--- firebird/trunk/examples/CMakeLists.txt	2015-01-26 15:00:31 UTC (rev 60562)
+++ firebird/trunk/examples/CMakeLists.txt	2015-01-26 15:23:27 UTC (rev 60563)
@@ -31,9 +31,9 @@
     COMMAND gpre -r -m -n -z ${CMAKE_CURRENT_SOURCE_DIR}/empbuild/empbuild.e empbuild.c
 )
 
-add_executable          (empbuild empbuild.c ${CMAKE_CURRENT_SOURCE_DIR}/empbuild/empbuild.e)
+add_executable          (empbuild empbuild.c empbuild.fdb ${CMAKE_CURRENT_SOURCE_DIR}/empbuild/empbuild.e)
 target_link_libraries   (empbuild yvalve)
-set_output_directory    (empbuild empbuild FORCE)
+set_output_directory    (empbuild . FORCE)
 add_dependencies        (empbuild gfix engine12 fbtrace)
 project_group           (empbuild Examples)
 
@@ -47,21 +47,19 @@
         COMMAND ${CMAKE_COMMAND} -E copy_if_different ${F} ${name})
 endforeach()
 
-set_unix (CMD PATH=${output_dir}/bin)
-set_apple(CMD DYLD_LIBRARY_PATH=${output_dir}/plugins:${output_dir}/lib ${CMD})
+set(EMPBUILD_CMD empbuild employe2.fdb)
+set_win32(EMPBUILD_CMD set PATH=%PATH%\\\\;${output_dir} COMMAND ${EMPBUILD_CMD})
+set_unix (EMPBUILD_CMD PATH=${output_dir}/bin ${EMPBUILD_CMD})
+set_apple(EMPBUILD_CMD DYLD_LIBRARY_PATH=${output_dir}/plugins:${output_dir}/lib ${EMPBUILD_CMD})
 
-if (WIN32)
-    add_custom_command(OUTPUT employe2.fdb DEPENDS empbuild ${files}
-        COMMAND ${CMAKE_COMMAND} -E remove employe2.fdb
-        COMMAND set PATH=%PATH%\;${output_dir}
-        COMMAND ${CMD} $<TARGET_FILE:empbuild> employe2.fdb
-    )
-else()
-    add_custom_command(OUTPUT employe2.fdb DEPENDS empbuild ${files}
-        COMMAND ${CMAKE_COMMAND} -E remove employe2.fdb
-        COMMAND ${CMD} $<TARGET_FILE:empbuild> employe2.fdb
-    )
-endif()
+add_custom_command(
+    OUTPUT employe2.fdb
+    DEPENDS
+        empbuild
+        ${files}
+    COMMAND ${CMAKE_COMMAND} -E remove employe2.fdb
+    COMMAND ${EMPBUILD_CMD}
+)
 add_custom_target       (employee_db DEPENDS employe2.fdb SOURCES ${files})
 project_group           (employee_db Examples)
 
@@ -71,7 +69,9 @@
 # SHARED LIBRARY udrcpp_example
 ########################################
 
-add_library             (udrcpp_example SHARED udr/UdrCppExample.cpp)
+file(GLOB udrcpp_example_src "udr/*")
+
+add_library             (udrcpp_example SHARED ${udrcpp_example_src})
 target_link_libraries   (udrcpp_example udr_engine)
 set_output_directory    (udrcpp_example plugins/udr)
 project_group           (udrcpp_example Examples)

Modified: firebird/trunk/src/CMakeLists.txt
===================================================================
--- firebird/trunk/src/CMakeLists.txt	2015-01-26 15:00:31 UTC (rev 60562)
+++ firebird/trunk/src/CMakeLists.txt	2015-01-26 15:23:27 UTC (rev 60563)
@@ -181,8 +181,10 @@
 add_custom_target(databases
     DEPENDS
         boot_engine12
+        help.fdb
+        metadata.fdb
         msg.fdb
-        help.fdb
+        security.fdb
     SOURCES
         ${databases_src}
 )

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.