Merge branch 'master' of https://git.shs.tools/SHS/pip

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.0)
 cmake_policy(SET CMP0017 NEW) # need include() with .cmake
 project(pip)
 set(_PIP_MAJOR    1)
-set(_PIP_MINOR    16)
+set(_PIP_MINOR    17)
 set(_PIP_REVISION 0)
 set(_PIP_SUFFIX   alpha)
 set(_PIP_COMPANY  SHS)
@@ -84,6 +84,8 @@ set(PIP_SRC_DIRS "src_main" "src_crypt" "src_compress" "src_usb" "src_fftw" "src
 set(PIP_LIBS_TARGETS pip)
 set(LIBS_MAIN)
 set(LIBS_STATUS)
+set(HDRS)
+set(PHDRS)
 
 if (TESTS)
 	set(PIP_SRC_CONCURRENT_TEST "src_concurrent/test")
@@ -110,12 +112,16 @@ set_version(PIP
 	REVISION "${_PIP_REVISION}"
 	BUILD    "${BUILD_NUMBER}"
 	SUFFIX   "${_PIP_SUFFIX}"
-	OUTPUT   "${CMAKE_CURRENT_SOURCE_DIR}/${PIP_SRC_MAIN}/piversion.h")
+	OUTPUT   "${CMAKE_CURRENT_BINARY_DIR}/piversion.h")
 set_deploy_property(pip ${PIP_LIB_TYPE}
 	LABEL "PIP main library"
 	FULLNAME "${_PIP_DOMAIN}.pip"
 	COMPANY "${_PIP_COMPANY}"
 	INFO "Platform-Independent Primitives")
+if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${PIP_SRC_MAIN}/piversion.h")
+	file(REMOVE "${CMAKE_CURRENT_SOURCE_DIR}/${PIP_SRC_MAIN}/piversion.h")
+endif()
+list(APPEND HDRS "${CMAKE_CURRENT_BINARY_DIR}/piversion.h")
 message(STATUS "Building PIP version ${PIP_VERSION} (${PIP_LIB_TYPE})")
 
 
@@ -352,7 +358,7 @@ if(NOT PIP_FREERTOS)
 if(WIN32)
 	if(${C_COMPILER} STREQUAL "cl.exe")
 	else()
-		list(APPEND LIBS_MAIN ws2_32 iphlpapi psapi)
+		list(APPEND LIBS_MAIN ws2_32 iphlpapi psapi cfgmgr32 setupapi)
 	endif()
 else()
 	list(APPEND LIBS_MAIN dl)