From 5e67403c4fb5536a2effe2e91181dd73a2cff91b Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Wed, 10 Apr 2024 07:15:49 -0700 Subject: [PATCH] cmake: fix building static lib on windows/msvc include(GNUInstallDirs) is required to populate CMAKE_INSTALL_LIBDIR [TJ: Patch partially applied: Dropped the lib rename part from ftdi1.a to ftdi1-static] --- CMakeLists.txt | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1f187e4..3ee49c6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,6 +30,8 @@ if(NOT PROJECT_SOURCE_DIR STREQUAL PROJECT_BINARY_DIR) file(GENERATE OUTPUT .gitignore CONTENT "*") endif() +include(GNUInstallDirs) + add_definitions(-Wall) include(CMakeOptions.txt) @@ -170,6 +172,9 @@ if(${UNIX}) endif(${UNIX}) if(${WIN32}) set(libdir ${CMAKE_INSTALL_PREFIX}/bin) + if(STATICLIBS) + list(APPEND libdir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) + endif() endif(${WIN32}) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libftdi1.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libftdi1.pc @ONLY) -- 1.7.1