Home Explore Help
Sign In
Apq
/
CMake
mirror of https://github.com/Kitware/CMake.git
1
0
Fork 0
Files Issues 0 Wiki
Browse Source

BUG: fix bug OUTPUT_LIBNAME_EXPORTS done differently now

Bill Hoffman 17 years ago
parent
823300d23b
commit
4eaac32db6
2 changed files with 11 additions and 11 deletions
Split View Show Diff Stats
  1. 7 7
      Templates/DLLHeader.dsptemplate
  2. 4 4
      Templates/EXEWinHeader.dsptemplate

+ 7 - 7
Templates/DLLHeader.dsptemplate
View File 

@@ -57,9 +57,9 @@ RSC=rc.exe
 
 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "OUTPUT_LIBNAME_EXPORTS" /FD /c

+# ADD BASE CPP /nologo /D "WIN32" /D "_WINDOWS" /D "_USRDLL" OUTPUT_LIBNAME_EXPORTS /FD /c

 # ADD CPP /nologo /D "WIN32" /D "_WINDOWS" /D "_USRDLL"  /FD /c

-# ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"

+# ADD CPP BUILD_INCLUDES EXTRA_DEFINES

 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS_RELEASE

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

@@ -89,9 +89,9 @@ CMAKE_CUSTOM_RULE_CODE_RELEASE
 
 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OUTPUT_LIBNAME_EXPORTS" /FD /c

+# ADD BASE CPP /nologo /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" OUTPUT_LIBNAME_EXPORTS /FD /c

 # ADD CPP /nologo /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL"  /FD /c

-# ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"

+# ADD CPP BUILD_INCLUDES EXTRA_DEFINES 

 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS_DEBUG

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

@@ -125,7 +125,7 @@ CMAKE_CUSTOM_RULE_CODE_DEBUG
 
 # ADD BASE CPP /nologo /D "WIN32"  /D "_WINDOWS" /D "_USRDLL" /FD /c

 # SUBTRACT BASE CPP /YX

 # ADD CPP /nologo /D "WIN32" /D "_WINDOWS" /D "_USRDLL"  /FD /c

-# ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"

+# ADD CPP BUILD_INCLUDES EXTRA_DEFINES OUTPUT_LIBNAME_EXPORTS

 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS_MINSIZEREL

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

@@ -155,9 +155,9 @@ CMAKE_CUSTOM_RULE_CODE_MINSIZEREL
 
 # PROP Intermediate_Dir "RelWithDebInfo"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "OUTPUT_LIBNAME_EXPORTS" /FD /c

+# ADD BASE CPP /nologo /D "WIN32" /D "_WINDOWS" /D "_USRDLL" OUTPUT_LIBNAME_EXPORTS /FD /c

 # ADD CPP /nologo /D "WIN32" /D "_WINDOWS" /D "_USRDLL"  /FD /c

-# ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"

+# ADD CPP BUILD_INCLUDES EXTRA_DEFINES 

 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS_RELWITHDEBINFO

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

+ 4 - 4
Templates/EXEWinHeader.dsptemplate
View File 

@@ -58,7 +58,7 @@ RSC=rc.exe
 
 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c

 # ADD CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c

-# ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"

+# ADD CPP BUILD_INCLUDES EXTRA_DEFINES OUTPUT_LIBNAME_EXPORTS

 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS_RELEASE

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

@@ -90,7 +90,7 @@ CMAKE_CUSTOM_RULE_CODE_RELEASE
 
 # PROP Target_Dir ""

 # ADD BASE CPP  /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c

 # ADD CPP /nologo  /D "WIN32"  /D "_DEBUG" /D "_WINDOWS" /FD /GZ /c

-# ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"

+# ADD CPP BUILD_INCLUDES EXTRA_DEFINES OUTPUT_LIBNAME_EXPORTS

 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS_DEBUG

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

@@ -121,7 +121,7 @@ CMAKE_CUSTOM_RULE_CODE_DEBUG
 
 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c

 # ADD CPP /nologo  /D "WIN32"  /D "NDEBUG" /D "_WINDOWS" /FD /c

-# ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"

+# ADD CPP BUILD_INCLUDES EXTRA_DEFINES OUTPUT_LIBNAME_EXPORTS

 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS_MINSIZEREL

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

@@ -151,7 +151,7 @@ CMAKE_CUSTOM_RULE_CODE_MINSIZEREL
 
 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c

 # ADD CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c

-# ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"

+# ADD CPP BUILD_INCLUDES EXTRA_DEFINES OUTPUT_LIBNAME_EXPORTS

 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS_RELWITHDEBINFO

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32