created tools dir and moved gtest and build into there, and trimmed some CMakeLists.txt files
This commit is contained in:
parent
85f66153ab
commit
0aa76fd05f
|
@ -57,8 +57,6 @@ INCLUDE(${cmake_dir}/CMakeLists_launcher.txt)
|
|||
INCLUDE(${cmake_dir}/CMakeLists_gtest.txt)
|
||||
INCLUDE(${cmake_dir}/CMakeLists_test.txt)
|
||||
|
||||
#add_subdirectory(third_party/gtest)
|
||||
|
||||
if (CONF_CPACK)
|
||||
# Setup the CPack config.
|
||||
INCLUDE(${cmake_dir}/CMakeLists_cpack.txt)
|
||||
|
|
|
@ -13,12 +13,10 @@
|
|||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
SET(root_lib ${root_dir}/lib)
|
||||
|
||||
SET(inc_gtest_dirs
|
||||
${root_dir}/third_party/gtest
|
||||
${root_dir}/third_party/gtest/include
|
||||
${root_dir}/tools/gtest
|
||||
${root_dir}/tools/gtest/include
|
||||
)
|
||||
|
||||
INCLUDE_DIRECTORIES(${inc_gtest_dirs})
|
||||
ADD_LIBRARY(gtest STATIC ${root_dir}/third_party/gtest/src/gtest-all.cc)
|
||||
ADD_LIBRARY(gtest STATIC ${root_dir}/tools/gtest/src/gtest-all.cc)
|
||||
|
|
|
@ -309,7 +309,6 @@ SET(src_lib_synergy
|
|||
${root_lib}/synergy/ProtocolTypes.cpp
|
||||
${root_lib}/synergy/XScreen.cpp
|
||||
${root_lib}/synergy/XSynergy.cpp
|
||||
${root_dir}/third_party/gtest/src/gtest-all.cc
|
||||
)
|
||||
|
||||
SET(inc_lib_synergy
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
# Include all files that have unit tests
|
||||
set(unittests
|
||||
${root_dir}/third_party/gtest/src/gtest_main.cc
|
||||
${root_dir}/tools/gtest/src/gtest_main.cc
|
||||
${root_dir}/src/unittest/synergy/CClipboardTests.cpp
|
||||
)
|
||||
|
||||
|
@ -41,24 +41,6 @@ if(UNIX)
|
|||
endif()
|
||||
endif()
|
||||
|
||||
set(inc
|
||||
${root_dir}
|
||||
${root_dir}/lib
|
||||
${root_dir}/lib/arch
|
||||
${root_dir}/lib/base
|
||||
${root_dir}/lib/client
|
||||
${root_dir}/lib/common
|
||||
${root_dir}/lib/io
|
||||
${root_dir}/lib/mt
|
||||
${root_dir}/lib/net
|
||||
${root_dir}/lib/platform
|
||||
${root_dir}/lib/synergy
|
||||
${root_dir}/third_party/gtest
|
||||
${root_dir}/third_party/gtest/include
|
||||
)
|
||||
|
||||
include_directories(${inc})
|
||||
|
||||
add_executable(unittests ${unittests})
|
||||
target_link_libraries(unittests synergy gtest ${libs})
|
||||
|
||||
|
|
2
hm.py
2
hm.py
|
@ -30,6 +30,8 @@
|
|||
# This will create an in-source UNIX Makefile.
|
||||
|
||||
import sys, os
|
||||
sys.path.append('tools')
|
||||
|
||||
from build import toolchain
|
||||
from getopt import gnu_getopt
|
||||
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue