Skip to content

Commit b750758

Browse files
committed
remove MSVC_TOOLCHAIN
1 parent 200bd2f commit b750758

File tree

2 files changed

+1
-14
lines changed

2 files changed

+1
-14
lines changed

CMakeLists.txt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
3333
set(CMAKE_CXX_EXTENSIONS OFF)
3434
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
3535

36-
if(WIN32 AND NOT MINGW)
37-
# This is used to handle builds using e.g. clang in an MSVC setting.
38-
set(MSVC_TOOLCHAIN TRUE)
39-
else()
40-
set(MSVC_TOOLCHAIN FALSE)
41-
endif()
42-
4336
option(ICEBERG_BUILD_STATIC "Build static library" ON)
4437
option(ICEBERG_BUILD_SHARED "Build shared library" OFF)
4538
option(ICEBERG_BUILD_TESTS "Build tests" ON)

cmake_modules/BuildUtils.cmake

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -162,13 +162,7 @@ function(ADD_ICEBERG_LIB LIB_NAME)
162162
target_include_directories(${LIB_NAME}_static PRIVATE ${ARG_PRIVATE_INCLUDES})
163163
endif()
164164

165-
# if(MSVC_TOOLCHAIN)
166-
# set(LIB_NAME_STATIC ${LIB_NAME}_static)
167-
# else()
168-
set(LIB_NAME_STATIC ${LIB_NAME})
169-
# endif()
170-
171-
set_target_properties(${LIB_NAME}_static PROPERTIES OUTPUT_NAME ${LIB_NAME_STATIC})
165+
set_target_properties(${LIB_NAME}_static PROPERTIES OUTPUT_NAME ${LIB_NAME})
172166

173167
if(ARG_STATIC_INSTALL_INTERFACE_LIBS)
174168
target_link_libraries(${LIB_NAME}_static

0 commit comments

Comments
 (0)