Centralize MFC build definition

Signed-off-by: Tobias Lorenz <[email protected]>
Ercem5 · Aug 21, 2014 · 623daaf · 623daaf
1 parent 02a3e6b
commit 623daaf
Show file tree

Hide file tree

Showing 12 changed files with 2 additions and 21 deletions.
diff --git a/Sources/Format Converter/AscLogConverter/CMakeLists.txt b/Sources/Format Converter/AscLogConverter/CMakeLists.txt
@@ -29,8 +29,6 @@ add_custom_command(
   DEPENDS Asc_Log_Parser.y
   WORKING_DIRECTORY ${BISON_PATH})
 
-add_definitions(-D_AFXDLL)
-
 include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}

diff --git a/Sources/Format Converter/BlfLibrary/CMakeLists.txt b/Sources/Format Converter/BlfLibrary/CMakeLists.txt
@@ -17,7 +17,7 @@ add_library(BlfLibrary SHARED ${sources} ${headers})
 
 add_definitions(-DBLFLIBRARY_EXPORTS -D_WINDLL)
 
-include_directories(BlfLibrary
+include_directories(
   ${ZLIB_INCLUDE_DIR})
 
 target_link_libraries(BlfLibrary

diff --git a/Sources/Format Converter/BlfLogConverter/CMakeLists.txt b/Sources/Format Converter/BlfLogConverter/CMakeLists.txt
@@ -13,8 +13,6 @@ set(resources
 
 add_library(BlfLogConverter SHARED ${sources} ${headers} ${resources})
 
-add_definitions(-D_AFXDLL)
-
 include_directories(
   ../BlfLibrary/Src
   ${GETTEXT_INCLUDE_DIR}

diff --git a/Sources/Format Converter/CAPL2CConverter/CMakeLists.txt b/Sources/Format Converter/CAPL2CConverter/CMakeLists.txt
@@ -34,8 +34,6 @@ add_custom_command(OUTPUT CAPL_C_Lexer.h
   ARGS -i -L -oCAPL_C_Lexer.h ${CMAKE_CURRENT_SOURCE_DIR}/lexer_rule.l
   DEPENDS lexer_rule.l)
 
-add_definitions(-D_AFXDLL)
-
 include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}

diff --git a/Sources/Format Converter/CMakeLists.txt b/Sources/Format Converter/CMakeLists.txt
@@ -56,6 +56,7 @@ set(MFC_LIBRARIES
   ${MFC_PATH}/lib/ATL/i386/atl.lib
   ${MFC_PATH}/lib/ATL/i386/atlthunk.lib)
 set(CMAKE_MFC_FLAG 2) # shared MFC library
+add_definitions(-D_AFXDLL)
 
 # zlib
 find_path(ZLIB_PATH

diff --git a/Sources/Format Converter/DBC2DBFConverter/CMakeLists.txt b/Sources/Format Converter/DBC2DBFConverter/CMakeLists.txt
@@ -13,8 +13,6 @@ set(resources
 
 add_library(DBC2DBFConverter SHARED ${sources} ${headers} ${resources})
 
-add_definitions(-D_AFXDLL)
-
 include_directories(
   ../DBF2DBCConverter
   ${GETTEXT_INCLUDE_DIR}

diff --git a/Sources/Format Converter/DBC2DBFConverterLibrary/CMakeLists.txt b/Sources/Format Converter/DBC2DBFConverterLibrary/CMakeLists.txt
@@ -36,8 +36,6 @@ add_custom_command(OUTPUT dbc_dbf_Lexer.c
   ARGS -i -L -odbc_dbf_Lexer.c ${CMAKE_CURRENT_SOURCE_DIR}/dbc_dbf_Lexer.l
   DEPENDS dbc_dbf_Lexer.l)
 
-add_definitions(-D_AFXDLL)
-
 include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}

diff --git a/Sources/Format Converter/DBF2DBCConverter/CMakeLists.txt b/Sources/Format Converter/DBF2DBCConverter/CMakeLists.txt
@@ -33,8 +33,6 @@ set(resources
 
 add_library(DBF2DBCConverter SHARED ${sources} ${headers} ${resources})
 
-add_definitions(-D_AFXDLL)
-
 include_directories(
   ${GETTEXT_INCLUDE_DIR}
   ${MFC_INCLUDE_DIRS})

diff --git a/Sources/Format Converter/FormatConverterApp/CMakeLists.txt b/Sources/Format Converter/FormatConverterApp/CMakeLists.txt
@@ -27,8 +27,6 @@ set(resources
 
 add_executable(FormatConverter WIN32 ${sources} ${headers} ${resources})
 
-add_definitions(-D_AFXDLL)
-
 include_directories(
   ${GETTEXT_INCLUDE_DIR}
   ${MFC_INCLUDE_DIRS})

diff --git a/Sources/Format Converter/J1939DBC2DBFConverter/CMakeLists.txt b/Sources/Format Converter/J1939DBC2DBFConverter/CMakeLists.txt
@@ -10,8 +10,6 @@ set(headers
 
 add_library(J1939DBC2DBFConverter SHARED ${sources} ${headers})
 
-add_definitions(-D_AFXDLL)
-
 include_directories(
   ${GETTEXT_INCLUDE_DIR}
   ${MFC_INCLUDE_DIRS})

diff --git a/Sources/Format Converter/LogAscConverter/CMakeLists.txt b/Sources/Format Converter/LogAscConverter/CMakeLists.txt
@@ -27,8 +27,6 @@ add_custom_command(OUTPUT Log_Asc_Parser.c Log_Asc_Parser.h
   DEPENDS Log_Asc_Parser.y
   WORKING_DIRECTORY ${BISON_PATH})
 
-add_definitions(-D_AFXDLL)
-
 include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}

diff --git a/Sources/Format Converter/LogToExcelConverter/CMakeLists.txt b/Sources/Format Converter/LogToExcelConverter/CMakeLists.txt
@@ -19,8 +19,6 @@ set(resources
 
 add_library(LogToExcelConverter SHARED ${sources} ${headers} ${resources})
 
-add_definitions(-D_AFXDLL)
-
 include_directories(
   ${GETTEXT_INCLUDE_DIR}
   ${MFC_INCLUDE_DIRS})