|
From: <ego...@us...> - 2015-02-12 15:50:42
|
Revision: 60676
http://sourceforge.net/p/firebird/code/60676
Author: egorpugin
Date: 2015-02-12 15:50:35 +0000 (Thu, 12 Feb 2015)
Log Message:
-----------
[build] [cmake] Fix issue with PATH on linux.
Modified Paths:
--------------
firebird/trunk/builds/cmake/BuildFunctions.cmake
firebird/trunk/src/CMakeLists.txt
Modified: firebird/trunk/builds/cmake/BuildFunctions.cmake
===================================================================
--- firebird/trunk/builds/cmake/BuildFunctions.cmake 2015-02-12 00:15:04 UTC (rev 60675)
+++ firebird/trunk/builds/cmake/BuildFunctions.cmake 2015-02-12 15:50:35 UTC (rev 60676)
@@ -264,8 +264,8 @@
set(dir ${boot_dir})
endif()
- set_win32(env "PATH=%PATH%\;${dir}")
- set_unix (env "PATH=$PATH:${dir}/bin")
+ set_win32(env "PATH=${dir}\;%PATH%")
+ set_unix (env "PATH=${dir}/bin:$PATH")
set(env "${env}"
FIREBIRD=${dir}
)
Modified: firebird/trunk/src/CMakeLists.txt
===================================================================
--- firebird/trunk/src/CMakeLists.txt 2015-02-12 00:15:04 UTC (rev 60675)
+++ firebird/trunk/src/CMakeLists.txt 2015-02-12 15:50:35 UTC (rev 60676)
@@ -347,7 +347,7 @@
endif()
add_library (common ${common_src} ${common_os_src} ${common_include})
-target_link_libraries (common PRIVATE ${LIB_mpr})
+target_link_libraries (common ${LIB_mpr})
################################################################################
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|