rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

split up bin and lib dirs from build dir

This commit is contained in:
Nick Bolton 2011-04-28 10:42:36 +00:00
parent 40b5a98790
commit 2155247425
5 changed files with 35 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -38,6 +38,10 @@ endif()
# First, declare project (important for prerequisite checks). # First, declare project (important for prerequisite checks).
project(synergy C CXX) project(synergy C CXX)
# put binaries in a different dir to make them easier to find.
set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib)
# Set some easy to type variables. # Set some easy to type variables.
set(root_dir ${CMAKE_SOURCE_DIR}) set(root_dir ${CMAKE_SOURCE_DIR})
set(cmake_dir ${root_dir}/res) set(cmake_dir ${root_dir}/res)
@ -332,8 +336,10 @@ if (CONF_CPACK)
# files to exclude from src package (regex patterns) # files to exclude from src package (regex patterns)
# to escape, use 4 backslashes (\\\\) -- yuck! # to escape, use 4 backslashes (\\\\) -- yuck!
set(CPACK_SOURCE_IGNORE_FILES set(CPACK_SOURCE_IGNORE_FILES
# temp output dir in root # temp output dirs in root
"/build/"
"/bin/" "/bin/"
"/lib/"
# generated config.h file # generated config.h file
"/config\\\\.h$" "/config\\\\.h$"
@ -372,4 +378,4 @@ if (CONF_DOXYGEN)
# For doxygen.cfg, save the results based on a template (doxygen.cfg.in). # For doxygen.cfg, save the results based on a template (doxygen.cfg.in).
configure_file(${cmake_dir}/doxygen.cfg.in ${doc_dir}/doxygen.cfg) configure_file(${cmake_dir}/doxygen.cfg.in ${doc_dir}/doxygen.cfg)
endif() endif()

4
hm.py
View File

@ -32,7 +32,9 @@
import sys, os import sys, os
sys.path.append('tools') sys.path.append('tools')
if os.path.exists('build'): # if old build src dir exists, move it, as this will now be used for build
# output.
if os.path.exists('build/toolchain.py'):
print "Removing legacy build dir." print "Removing legacy build dir."
os.rename('build', 'build.old') os.rename('build', 'build.old')

22
src/test/integtests/CMakeLists.txt
View File

@ -41,21 +41,21 @@ elseif (UNIX)
endif() endif()
set(inc set(inc
../lib/arch ../../lib/arch
../lib/base ../../lib/base
../lib/client ../../lib/client
../lib/common ../../lib/common
../lib/io ../../lib/io
../lib/mt ../../lib/mt
../lib/net ../../lib/net
../lib/platform ../../lib/platform
../lib/synergy ../../lib/synergy
../../tools/gtest/include ../../../../tools/gtest/include
) )
if (UNIX) if (UNIX)
list(APPEND inc list(APPEND inc
../.. ../../..
) )
endif() endif()

24
src/test/unittests/CMakeLists.txt
View File

@ -14,26 +14,26 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
set(src set(src
../../tools/gtest/src/gtest_main.cc ../../../../tools/gtest/src/gtest_main.cc
synergy/CClipboardTests.cpp synergy/CClipboardTests.cpp
) )
set(inc set(inc
../lib/arch ../../lib/arch
../lib/base ../../lib/base
../lib/client ../../lib/client
../lib/common ../../lib/common
../lib/io ../../lib/io
../lib/mt ../../lib/mt
../lib/net ../../lib/net
../lib/platform ../../lib/platform
../lib/synergy ../../lib/synergy
../../tools/gtest/include ../../../../tools/gtest/include
) )
if (UNIX) if (UNIX)
list(APPEND inc list(APPEND inc
../.. ../../..
) )
endif() endif()

2
tools/build/toolchain.py
View File

@ -36,7 +36,7 @@ class InternalCommands:
source_dir = '..' # Source, relative to build. source_dir = '..' # Source, relative to build.
cmake_dir = 'res' cmake_dir = 'res'
_bin_dir = 'bin' _bin_dir = 'build'
gui_dir = 'src/gui' gui_dir = 'src/gui'
doc_dir = 'doc' doc_dir = 'doc'