Skip to content

Commit 01cdd33

Browse files
hatlonelyhatlonely
committed
update cmakelists
1 parent de3b3f3 commit 01cdd33

4 files changed

Lines changed: 23 additions & 32 deletions

File tree

‎cplusplus/configure/CMakeLists.txt‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,14 @@ PROJECT(LH_CONFIGURE)
44
SET(CMAKE_VERBOSE_MAKEFILE OFF)
55
SET(LIBRARY_OUTPUT_PATH ${LH_CONFIGURE_BINARY_DIR}/lib)
66
SET(CMAKE_CXX_FLAGS "-g -pipe -W -Wall -fPIC")
7+
SET(WORK_ROOT "../../../..")
78

89
AUX_SOURCE_DIRECTORY(src SOURCES)
9-
SET(SRC_LIST
10-
${SOURCES}
11-
)
10+
SET(SRC_LIST ${SOURCES})
1211

1312
INCLUDE_DIRECTORIES(
1413
"./include"
15-
"${LH_CONFIGURE_SOURCE_DIR}/../../../../third/boost/boost-1.56.0/include"
16-
"${LH_CONFIGURE_SOURCE_DIR}/../../../../google/gtest/gtest-1.6.0/include"
14+
"${LH_CONFIGURE_SOURCE_DIR}/${WORK_ROOT}/third/boost/boost-1.56.0/include"
1715
)
1816

1917
ADD_LIBRARY(lh_configure ${SRC_LIST})

‎cplusplus/configure/test/CMakeLists.txt‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,23 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
22
PROJECT(LH_CONFIGURE_TEST)
33

44
SET(CMAKE_VERBOSE_MAKEFILE OFF)
5-
SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
5+
SET(EXECUTABLE_OUTPUT_PATH ${LH_CONFIGURE_TEST_BINARY_DIR}/bin)
66
SET(CMAKE_CXX_FLAGS "-g -pipe -W -Wall -fPIC")
7+
SET(WORK_ROOT "../../../../..")
78

89
AUX_SOURCE_DIRECTORY(../src SOURCES)
910
AUX_SOURCE_DIRECTORY(. TEST_SOURCES)
10-
SET(SRC_LIST
11-
${SOURCES}
12-
${TEST_SOURCES}
13-
)
11+
SET(SRC_LIST ${SOURCES} ${TEST_SOURCES})
1412

1513
INCLUDE_DIRECTORIES(
1614
"../include"
17-
"${LH_CONFIGURE_TEST_SOURCE_DIR}/../../../../../third/boost/boost-1.56.0/include"
18-
"${LH_CONFIGURE_TEST_SOURCE_DIR}/../../../../../google/gtest/gtest-1.6.0/include"
15+
"${LH_CONFIGURE_TEST_SOURCE_DIR}/${WORK_ROOT}/third/boost/boost-1.56.0/include"
16+
"${LH_CONFIGURE_TEST_SOURCE_DIR}/${WORK_ROOT}/google/gtest/gtest-1.6.0/include"
1917
)
2018

2119
LINK_DIRECTORIES(
22-
"${LH_CONFIGURE_TEST_SOURCE_DIR}/../../../../../third/boost/boost-1.56.0/lib"
23-
"${LH_CONFIGURE_TEST_SOURCE_DIR}/../../../../../google/gtest/gtest-1.6.0/lib"
20+
"${LH_CONFIGURE_TEST_SOURCE_DIR}/${WORK_ROOT}/third/boost/boost-1.56.0/lib"
21+
"${LH_CONFIGURE_TEST_SOURCE_DIR}/${WORK_ROOT}/google/gtest/gtest-1.6.0/lib"
2422
)
2523

2624
ADD_DEFINITIONS(

‎cplusplus/logger/CMakeLists.txt‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,15 @@ PROJECT(LH_LOGGER)
44
SET(CMAKE_VERBOSE_MAKEFILE OFF)
55
SET(LIBRARY_OUTPUT_PATH ${LH_LOGGER_BINARY_DIR}/lib)
66
SET(CMAKE_CXX_FLAGS "-g -pipe -W -Wall -fPIC")
7+
SET(WORK_ROOT "../../../..")
78

89
AUX_SOURCE_DIRECTORY(src SOURCES)
9-
SET(SRC_LIST
10-
${SOURCES}
11-
)
10+
SET(SRC_LIST ${SOURCES})
1211

1312
INCLUDE_DIRECTORIES(
1413
"./include"
15-
"${LH_LOGGER_SOURCE_DIR}/../../../../loadinghorizion/configure/configure-1.0.0/include"
16-
"${LH_LOGGER_SOURCE_DIR}/../../../../third/boost/boost-1.56.0/include"
14+
"${LH_LOGGER_SOURCE_DIR}/${WORK_ROOT}/third/boost/boost-1.56.0/include"
15+
"${LH_LOGGER_SOURCE_DIR}/${WORK_ROOT}/loadinghorizion/configure/configure-1.0.0/include"
1716
)
1817

1918
ADD_LIBRARY(lh_logger ${SRC_LIST})

‎cplusplus/logger/test/CMakeLists.txt‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,25 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
22
PROJECT(LH_LOGGER_TEST)
33

44
SET(CMAKE_VERBOSE_MAKEFILE OFF)
5-
SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
5+
SET(EXECUTABLE_OUTPUT_PATH ${LH_LOGGER_TEST_BINARY_DIR}/bin)
66
SET(CMAKE_CXX_FLAGS "-g -pipe -W -Wall -fPIC")
7+
SET(WORK_ROOT "../../../../..")
78

89
AUX_SOURCE_DIRECTORY(../src SOURCES)
910
AUX_SOURCE_DIRECTORY(. TEST_SOURCES)
10-
SET(SRC_LIST
11-
${SOURCES}
12-
${TEST_SOURCES}
13-
)
11+
SET(SRC_LIST ${SOURCES} ${TEST_SOURCES})
1412

1513
INCLUDE_DIRECTORIES(
1614
"../include"
17-
"${LH_LOGGER_TEST_SOURCE_DIR}/../../../../../third/boost/boost-1.56.0/include"
18-
"${LH_LOGGER_TEST_SOURCE_DIR}/../../../../../google/gtest/gtest-1.6.0/include"
19-
"${LH_LOGGER_TEST_SOURCE_DIR}/../../../../../loadinghorizion/configure/configure-1.0.0/include"
15+
"${LH_LOGGER_TEST_SOURCE_DIR}/${WORK_ROOT}/third/boost/boost-1.56.0/include"
16+
"${LH_LOGGER_TEST_SOURCE_DIR}/${WORK_ROOT}/loadinghorizion/configure/configure-1.0.0/include"
17+
"${LH_LOGGER_TEST_SOURCE_DIR}/${WORK_ROOT}/google/gtest/gtest-1.6.0/include"
2018
)
2119

2220
LINK_DIRECTORIES(
23-
"${LH_LOGGER_TEST_SOURCE_DIR}/../../../../../third/boost/boost-1.56.0/lib"
24-
"${LH_LOGGER_TEST_SOURCE_DIR}/../../../../../google/gtest/gtest-1.6.0/lib"
25-
"${LH_LOGGER_TEST_SOURCE_DIR}/../../../../../loadinghorizion/configure/configure-1.0.0/lib"
21+
"${LH_LOGGER_TEST_SOURCE_DIR}/${WORK_ROOT}/third/boost/boost-1.56.0/lib"
22+
"${LH_LOGGER_TEST_SOURCE_DIR}/${WORK_ROOT}/loadinghorizion/configure/configure-1.0.0/lib"
23+
"${LH_LOGGER_TEST_SOURCE_DIR}/${WORK_ROOT}/google/gtest/gtest-1.6.0/lib"
2624
)
2725

2826
ADD_DEFINITIONS(
@@ -42,8 +40,6 @@ TARGET_LINK_LIBRARIES(lh_logger_test
4240
ADD_CUSTOM_COMMAND(
4341
TARGET lh_logger_test
4442
POST_BUILD
45-
COMMAND echo "${LH_LOGGER_TEST_SOURCE_DIR}"
46-
COMMAND echo "${LH_LOGGER_TEST_BINARY_DIR}"
4743
COMMAND mkdir -p log
4844
COMMAND cp -r ${LH_LOGGER_TEST_SOURCE_DIR}/../conf .
4945
)

0 commit comments

Comments
 (0)