Skip to content

Commit 5ca79cd

Browse files
authored
Fix the issue where the output path of external settings does not take effect! (#111)
1 parent 1976b51 commit 5ca79cd

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

CMakeLists.txt

+9-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.5)
1+
cmake_minimum_required(VERSION 3.5)
22

33
project(hwinfo VERSION 1.0.0 LANGUAGES CXX)
44

@@ -7,8 +7,12 @@ if (WIN32)
77
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
88
endif()
99

10-
set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
11-
set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
10+
if(NOT HWINFO_CMAKE_BINARY_DIR)
11+
set(HWINFO_CMAKE_BINARY_DIR ${CMAKE_BINARY_DIR})
12+
endif()
13+
14+
set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${HWINFO_CMAKE_BINARY_DIR})
15+
set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${HWINFO_CMAKE_BINARY_DIR})
1216

1317
# if standard not provided, use the latest supported by the compiler
1418
if("${CMAKE_CXX_STANDARD}" STREQUAL "")
@@ -52,8 +56,8 @@ else(HWINFO_STATIC)
5256
set(HWINFO_BUILD STATIC)
5357
endif()
5458

55-
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
56-
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
59+
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${HWINFO_CMAKE_BINARY_DIR}/lib)
60+
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${HWINFO_CMAKE_BINARY_DIR}/lib)
5761

5862
set(HWINFO_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include")
5963
add_subdirectory(src)

0 commit comments

Comments
 (0)