Merge pull request #15 from leapmotion/fix-debug-suffix

Fixed a problem where d would not be added to debug builds
leapmotion · Aug 16, 2016 · 3a3d0e2 · 3a3d0e2
2 parents a1b05cf + ce51c1a
commit 3a3d0e2
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/standard/StandardProject.cmake b/standard/StandardProject.cmake
@@ -82,7 +82,11 @@ function(standard_project_preinit)
   set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/lib PARENT_SCOPE)
 
   # Postfix on all debug libraries should be "d"
-  set(CMAKE_DEBUG_POSTFIX d${CMAKE_DEBUG_POSTFIX} PARENT_SCOPE)
+  # PARENT_SCOPE causes the variable to not be set locally, and we
+  # rely on this value in the following loop....
+
+  set(CMAKE_DEBUG_POSTFIX "d${CMAKE_DEBUG_POSTFIX}")
+  set(CMAKE_DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX} PARENT_SCOPE)
 
   # 64-bit installations should suffix with 64 regardless of the CPU type (arm or intel)
   if(CMAKE_SIZEOF_VOID_P EQUAL 8)