Changeset 1939

Timestamp:

Jan 20, 2017, 3:47:08 PM (8 years ago)

Author:

Silvan Scherrer

Message:

cmake: fix possible wrong generated def files

Location:

cmake/trunk

Files:

• Modules/Platform/os2.cmake (modified) (1 diff)
• Source/cmLocalGenerator.cxx (modified) (1 diff)

cmake/trunk/Modules/Platform/os2.cmake ¶

@@ -114 +114 @@
 
 SET(CMAKE_C_CREATE_SHARED_LIBRARY
-  "echo LIBRARY <TARGET_BASE> INITINSTANCE TERMINSTANCE > <TARGET_BASE>.def && echo DESCRIPTION \\\"@\#${VENDOR_BLDLevel}:${VERSION_BLDLevel}\#@${bldLevelInfo}::::${PATCH_BLDLevel}::@@<TARGET_BASE>\\\" >> <TARGET_BASE>.def && echo DATA MULTIPLE NONSHARED >> <TARGET_BASE>.def && echo EXPORTS >> <TARGET_BASE>.def && emxexp <OBJECTS> >> <TARGET_BASE>.def && <CMAKE_C_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> ${CMAKE_GNULD_IMAGE_VERSION} <OBJECTS> <LINK_LIBRARIES> <TARGET_BASE>.def && emximp -o <TARGET_IMPLIB> <TARGET_BASE>.def")
+  "echo LIBRARY <TARGET_OS2DEF> INITINSTANCE TERMINSTANCE > <TARGET_BASE>.def && echo DESCRIPTION \\\"@\#${VENDOR_BLDLevel}:${VERSION_BLDLevel}\#@${bldLevelInfo}::::${PATCH_BLDLevel}::@@<TARGET_NAME>\\\" >> <TARGET_BASE>.def && echo DATA MULTIPLE NONSHARED >> <TARGET_BASE>.def && echo EXPORTS >> <TARGET_BASE>.def && emxexp <OBJECTS> >> <TARGET_BASE>.def && <CMAKE_C_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> ${CMAKE_GNULD_IMAGE_VERSION} <OBJECTS> <LINK_LIBRARIES> <TARGET_BASE>.def && emximp -o <TARGET_IMPLIB> <TARGET_BASE>.def")
 SET(CMAKE_CXX_CREATE_SHARED_LIBRARY
-  "echo LIBRARY <TARGET_BASE> INITINSTANCE TERMINSTANCE > <TARGET_BASE>.def && echo DESCRIPTION \\\"@\#${VENDOR_BLDLevel}:${VERSION_BLDLevel}\#@${bldLevelInfo}::::${PATCH_BLDLevel}::@@<TARGET_BASE>\\\" >> <TARGET_BASE>.def && echo DATA MULTIPLE NONSHARED >> <TARGET_BASE>.def && echo EXPORTS >> <TARGET_BASE>.def && emxexp <OBJECTS> >> <TARGET_BASE>.def && <CMAKE_CXX_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> -o <TARGET> ${CMAKE_GNULD_IMAGE_VERSION} <OBJECTS> <LINK_LIBRARIES> <TARGET_BASE>.def && emximp -o <TARGET_IMPLIB> <TARGET_BASE>.def")
+  "echo LIBRARY <TARGET_OS2DEF> INITINSTANCE TERMINSTANCE > <TARGET_BASE>.def && echo DESCRIPTION \\\"@\#${VENDOR_BLDLevel}:${VERSION_BLDLevel}\#@${bldLevelInfo}::::${PATCH_BLDLevel}::@@<TARGET_NAME>\\\" >> <TARGET_BASE>.def && echo DATA MULTIPLE NONSHARED >> <TARGET_BASE>.def && echo EXPORTS >> <TARGET_BASE>.def && emxexp <OBJECTS> >> <TARGET_BASE>.def && <CMAKE_CXX_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> -o <TARGET> ${CMAKE_GNULD_IMAGE_VERSION} <OBJECTS> <LINK_LIBRARIES> <TARGET_BASE>.def && emximp -o <TARGET_IMPLIB> <TARGET_BASE>.def")
 
 SET(CMAKE_C_LINK_EXECUTABLE

cmake/trunk/Source/cmLocalGenerator.cxx ¶

@@ -644 +644 @@
       }
     }
+#ifdef __OS2__
+// give back the name of the target without extension and any leading path
+// this is needed to have the def files created right
+    if (replaceValues.Target) {
+      if (variable == "TARGET_OS2DEF") {
+        std::string targetName;
+        std::string targetBase;
+        std::string::size_type pos;
+
+        // remove leading path stuff if any
+        targetName = replaceValues.Target;
+        pos = targetName.find_last_of("/\\");
+        if (pos != targetName.npos)
+          targetBase = targetName.substr(pos+1);
+        else
+          targetBase = targetName;
+
+        // Strip the last extension off the target name.
+        pos = targetBase.rfind('.');
+        if (pos != targetBase.npos) {
+          return targetBase.substr(0, pos);
+        }
+        return targetBase;
+      }
+    }
+#endif
   }
   if (variable == "TARGET_SONAME" || variable == "SONAME_FLAG" ||