Merge remote-tracking branch 'jwinarske/cmake' into mingw

bscottm · bscottm · commit 9c0a0b8ae27e · 2020-06-26T13:59:03.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -1,32 +1,32 @@
-*.un~
-*~
-*.obj
-*.dll.manifest
-*.dll
-*.exe.manifest
-*.exe
-*.lib
-*.pdb
-*.ilk
-*.exp
-config.log
-config.h.in
-config.status
-configure
-version.res
-tests/*.pass
-tests/*.bench
-tests/pthread.h
-tests/sched.h
-tests/semaphore.h
-tests/benchlib.o
-tests/SIZES.*
-tests/*.log
-/.project
-build
-cmake-build
-autom4te.cache
-PTHREADS-BUILT
-.vscode
-GNUmakefile
-tests/GNUmakefile
+*.un~
+*~
+*.obj
+*.dll.manifest
+*.dll
+*.exe.manifest
+*.exe
+*.lib
+*.pdb
+*.ilk
+*.exp
+config.log
+config.h.in
+config.status
+configure
+version.res
+tests/*.pass
+tests/*.bench
+tests/pthread.h
+tests/sched.h
+tests/semaphore.h
+tests/benchlib.o
+tests/SIZES.*
+tests/*.log
+/.project
+build
+cmake-build
+autom4te.cache
+PTHREADS-BUILT
+.vscode
+GNUmakefile
+tests/GNUmakefile
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,10 @@
 cmake_minimum_required(VERSION 3.14)
 
+if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE "MinSizeRel" CACHE STRING "Choose the type of build, options are: Debug, Release, or MinSizeRel." FORCE)
+    message(STATUS "No build type specified, defaulting to MinSizeRel.")
+endif()
+
 set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${CMAKE_SOURCE_DIR}/cmake")
 
 include (CheckIncludeFile)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2019-11-03  Ross Johnson <ross dot johnson at homemail dot com dot au>
+
+	* NOTICE: Remove third party code acknowledgments because files have been
+	removed from distro.
+
 2018-08-19  Ross Johnson <ross dot johnson at homemail dot com dot au>
 
 	* context.h (__PTW32_PROCPTR): Added missing '__' prefix for v3.
diff --git a/NOTICE b/NOTICE
@@ -4,26 +4,4 @@ Copyright 1999-2018, Pthreads4w contributors
 
 This product includes software developed through the colaborative
 effort of several individuals, each of whom is listed in the file
-CONTRIBUTORS included with this software.
-
-The following files are not covered under the Copyrights
-listed above:
-
-    [1] tests/rwlock7.c
-    [1] tests/rwlock7_1.c
-    [1] tests/rwlock8.c
-    [1] tests/rwlock8_1.c
-    [2] tests/threestage.c
-
-[1] The file tests/rwlock7.c and those similarly named are derived from
-code written by Dave Butenhof for his book 'Programming With POSIX(R)
-Threads'. The original code was obtained by free download from his
-website http://home.earthlink.net/~anneart/family/Threads/source.html
-
-[2] The file tests/threestage.c is taken directly from examples in the
-book "Windows System Programming, Edition 4" by Johnson (John) Hart
-Session 6, Chapter 10. ThreeStage.c
-Several required additional header and source files from the
-book examples have been included inline to simplify compilation.
-The only modification to the code has been to provide default
-values when run without arguments.
+CONTRIBUTORS included with this software.
diff --git a/_ptw32.h b/_ptw32.h
@@ -43,10 +43,10 @@
  */
 #define  __PTW32_VERSION_MAJOR 3
 #define  __PTW32_VERSION_MINOR 0
-#define  __PTW32_VERSION_MICRO 1
+#define  __PTW32_VERSION_MICRO 2
 #define  __PTW32_VERION_BUILD 0
-#define  __PTW32_VERSION 3,0,0,1
-#define  __PTW32_VERSION_STRING "3, 0, 1, 0\0"
+#define  __PTW32_VERSION 3,0,2,0
+#define  __PTW32_VERSION_STRING "3, 0, 2, 0\0"
 
 #if defined(__GNUC__)
 # pragma GCC system_header
diff --git a/cmake/target_arch.cmake b/cmake/target_arch.cmake
@@ -1,6 +1,5 @@
 
 set(TARGET_ARCH_DETECT_CODE "
-
 #if defined(_M_ARM)
 #  error cmake_arch ARM
 #elif defined(_M_ARM64)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -14,8 +14,7 @@ string(REPLACE "-DNDEBUG" "-UNDEBUG" CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEA
 
 message(STATUS "Test destination prefix: ${TESTPREFIX}")
 
-function(add_testcase test type def)
-
+macro(add_testcase test type def)
     set(lib_test test-${test}${type}${PTW32_VER})
     set(dll_test test-dll-${test}${type}${PTW32_VER})
 
@@ -39,10 +38,10 @@ function(add_testcase test type def)
     add_executable(${lib_test} ${test}.c ${c_dep})
     target_link_libraries(${lib_test} ${lib_lib} ${XXLIBS})
     if(MSVC)
-      target_compile_options(${lib_test} PRIVATE "/nologo")
+      target_compile_options(${lib_test} PUBLIC "/nologo")
     endif()
-    target_compile_definitions(${lib_test} PRIVATE _CONSOLE _MBCS ${def})
-    target_compile_options(${lib_test} PRIVATE ${extra})
+    target_compile_definitions(${lib_test} PUBLIC _CONSOLE _MBCS ${def})
+    target_compile_options(${lib_test} PUBLIC ${extra})
     if (${CMAKE_C_COMPILER_ID} STREQUAL "GNU" OR ${CMAKE_C_COMPILER_ID} STREQUAL "Clang")
 	# GNUmakefile compiles every test as C++:
 	target_compile_definitions(${lib_test} PRIVATE __PtW32NoCatchWarn)
@@ -59,7 +58,7 @@ function(add_testcase test type def)
     add_executable(${dll_test} ${test}.c ${c_dep})
     target_link_libraries(${dll_test} ${dll_lib} ${XXLIBS})
     if(MSVC)
-      target_compile_options(${dll_test} PRIVATE "/nologo")
+      target_compile_options(${dll_test} PUBLIC "/nologo")
     endif()
     target_compile_definitions(${dll_test} PRIVATE _CONSOLE _MBCS ${def})
     target_compile_options(${dll_test} PRIVATE ${extra})
@@ -103,7 +102,7 @@ function(add_testcase test type def)
     add_test(NAME ${lib_test} COMMAND ${lib_test})
     add_test(NAME ${dll_test} COMMAND ${dll_test})
 
-endfunction()
+endmacro()
 
 
 file(GLOB TESTS *.c)
diff --git a/tests/ChangeLog b/tests/ChangeLog
@@ -1,3 +1,11 @@
+2018-08-19  Ross Johnson <ross dot johnson at homemail dot com dot au>
+
+	* threestage.c: Delete.
+	* rwlock7.c: Delete.
+	* rwlock8.c: Delete.
+	* rwlock7_1.c: Delete.
+	* rwlock8_1.c: Delete.
+
 2018-08-10  Ross Johnson <ross dot johnson at homemail dot com dot au>
 
 	* Makefile (clean): remove *.idb files.
diff --git a/tests/common.mk b/tests/common.mk
@@ -40,7 +40,7 @@ ALL_KNOWN_TESTS = \
 	robust1 robust2 robust3 robust4 robust5 \
 	rwlock1 rwlock2 rwlock3 rwlock4 \
 	rwlock2_t rwlock3_t rwlock4_t rwlock5_t rwlock6_t rwlock6_t2 \
-	rwlock5 rwlock6 rwlock7 rwlock7_1 rwlock8 rwlock8_1 \
+	rwlock5 rwlock6 \
 	self1 self2 \
 	semaphore1 semaphore2 semaphore3 \
 	semaphore4 semaphore4t semaphore5 \
diff --git a/tests/runorder.mk b/tests/runorder.mk
@@ -113,7 +113,7 @@ once3.pass: once2.pass
 once4.pass: once3.pass
 priority1.pass: join1.pass
 priority2.pass: priority1.pass barrier3.pass
-reinit1.pass: rwlock7.pass
+reinit1.pass: rwlock6.pass
 reuse1.pass: create3.pass
 reuse2.pass: reuse1.pass
 robust1.pass: mutex8r.pass
@@ -127,13 +127,11 @@ rwlock3.pass: rwlock2.pass join2.pass
 rwlock4.pass: rwlock3.pass
 rwlock5.pass: rwlock4.pass
 rwlock6.pass: rwlock5.pass
-rwlock7.pass: rwlock6.pass
-rwlock8.pass: rwlock7.pass
 rwlock2_t.pass: rwlock2.pass
-rwlock3_t.pass: rwlock2_t.pass
-rwlock4_t.pass: rwlock3_t.pass
-rwlock5_t.pass: rwlock4_t.pass
-rwlock6_t.pass: rwlock5_t.pass
+rwlock3_t.pass: rwlock3.pass rwlock2_t.pass
+rwlock4_t.pass: rwlock4.pass rwlock3_t.pass
+rwlock5_t.pass: rwlock5.pass rwlock4_t.pass
+rwlock6_t.pass: rwlock6.pass rwlock5_t.pass
 rwlock6_t2.pass: rwlock6_t.pass
 self1.pass: sizes.pass
 self2.pass: self1.pass equal1.pass create1.pass
diff --git a/tests/rwlock7.c b/tests/rwlock7.c
diff --git a/tests/rwlock7_1.c b/tests/rwlock7_1.c
diff --git a/tests/rwlock8.c b/tests/rwlock8.c
diff --git a/tests/rwlock8_1.c b/tests/rwlock8_1.c
diff --git a/tests/threestage.c b/tests/threestage.c
