Merge pull request #41 from tsmoreland/development

correcting output filenames in cmakelists and nuspec

Author: tsmoreland

modern_win32_vc143_spectre_md.nuspec

@@ -23,13 +23,13 @@
     <file src="modern_win32_vc143_spectre_md.targets" target="build" />
     <file src="out\install\vc143-x64-release-spectre\include\**\*.*" target="lib\native\include\" />
 
-    <file src="out\install\vc143-x64-release-spectre\lib\modern_win32_spectre_md.lib" target="lib\native\x64" />
-    <file src="out\install\vc143-x64-release-spectre\lib\modern_win32_spectre_md.dll" target="lib\native\x64" />
-    <file src="out\install\vc143-x64-release-spectre\lib\modern_win32_spectre_md.pdb" target="lib\native\x64" />
+    <file src="out\install\vc143-x64-release-spectre\lib\modern_win32_vc143_spectre_md.lib" target="lib\native\x64" />
+    <file src="out\install\vc143-x64-release-spectre\lib\modern_win32_vc143_spectre_md.dll" target="lib\native\x64" />
+    <file src="out\install\vc143-x64-release-spectre\lib\modern_win32_vc143_spectre_md.pdb" target="lib\native\x64" />
 
-    <file src="out\install\vc143-x64-debug-spectre\lib\modern_win32_spectre_mdd.lib" target="lib\native\x64" />
-    <file src="out\install\vc143-x64-debug-spectre\lib\modern_win32_spectre_mdd.dll" target="lib\native\x64" />
-    <file src="out\install\vc143-x64-debug-spectre\lib\modern_win32_spectre_mdd.pdb" target="lib\native\x64" />
+    <file src="out\install\vc143-x64-debug-spectre\lib\modern_win32_vc143_spectre_mdd.lib" target="lib\native\x64" />
+    <file src="out\install\vc143-x64-debug-spectre\lib\modern_win32_vc143_spectre_mdd.dll" target="lib\native\x64" />
+    <file src="out\install\vc143-x64-debug-spectre\lib\modern_win32_vc143_spectre_mdd.pdb" target="lib\native\x64" />
 
   </files>
 </package>

src/modern_win32/CMakeLists.txt

@@ -114,8 +114,8 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
 			target_compile_options(modern_win32 PRIVATE /Qspectre)
 
 			target_link_options(modern_win32 PRIVATE /DYNAMICBASE)
-            set_target_properties(modern_win32 PROPERTIES LIBRARY_OUTPUT_NAME "modern_win32_spectre_vc143_mdd")
-            set_target_properties(modern_win32 PROPERTIES OUTPUT_NAME "modern_win32_spectre_vc143_mdd")
+            set_target_properties(modern_win32 PROPERTIES LIBRARY_OUTPUT_NAME "modern_win32_vc143_spectre_mdd")
+            set_target_properties(modern_win32 PROPERTIES OUTPUT_NAME "modern_win32_vc143_spectre_mdd")
 		else()
 			message(status " Spectre is not enabled")
             set_target_properties(modern_win32 PROPERTIES LIBRARY_OUTPUT_NAME "modern_win32_vc143_mdd")

tests/modern_win32_test/CMakeLists.txt

@@ -88,7 +88,8 @@ if (CMAKE_BUILD_TYPE MATCHES "Release")
 		add_custom_command(
 			TARGET modern_win32_test
 			POST_BUILD
-			COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/../../out/build/${PRESET_NAME}/src/modern_win32/modern_win32_spectre_vc143_md.dll ${CMAKE_CURRENT_SOURCE_DIR}/../../out/build/${PRESET_NAME}/tests/modern_win32_test/modern_win32_spectre_vc143_md.dll 
+
+			COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/../../out/build/${PRESET_NAME}/src/modern_win32/modern_win32_vc143_spectre_md.dll ${CMAKE_CURRENT_SOURCE_DIR}/../../out/build/${PRESET_NAME}/tests/modern_win32_testmodern_win32_vc143_spectre_md.dll 
 			COMMENT "Copying modern_win32.dll to modern_win32_test folder"
 		)
 	else()
@@ -104,7 +105,7 @@ else()
 		add_custom_command(
 			TARGET modern_win32_test
 			POST_BUILD
-			COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/../../out/build/${PRESET_NAME}/src/modern_win32/modern_win32_spectre_vc143_mdd.dll ${CMAKE_CURRENT_SOURCE_DIR}/../../out/build/${PRESET_NAME}/tests/modern_win32_test/modern_win32_spectre_vc143_mdd.dll 
+			COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/../../out/build/${PRESET_NAME}/src/modern_win32/modern_win32_vc143_spectre_mdd.dll ${CMAKE_CURRENT_SOURCE_DIR}/../../out/build/${PRESET_NAME}/tests/modern_win32_test/modern_win32_vc143_spectre_mdd.dll 
 			COMMENT "Copying modern_win32.dll to modern_win32_test folder"
 		)
 	else()