fixup

Author: illwieckz

src/trusted/validator_ragel/CMakeLists.txt

@@ -1,31 +1,37 @@
+set(VALIDATOR_DEFINITIONS "-DVALIDATOR_EXPORT=DLLEXPORT")
+
 # src/trusted/validator_ragel/build.scons built both for both bitness
 # because it was needed for the rdfa_validator library which looks to
 # only be used for running some benchmark.
 if (ARCH STREQUAL "i686")
-	add_library(validator32 OBJECT "gen/validator_x86_32.c")
+	set(VALIDATOR_LIB validator32)
+	add_library(${VALIDATOR_LIB} OBJECT "gen/validator_x86_32.c")
 elseif (ARCH STREQUAL "amd64")
-	add_library(validator64 OBJECT "gen/validator_x86_64.c")
+	set(VALIDATOR_LIB validator64)
+	add_library(${VALIDATOR_LIB} OBJECT "gen/validator_x86_64.c")
 endif()
 
 add_library(validator_features_all OBJECT "validator_features_all.c")
+set_target_properties(validator_features_all PROPERTIES DEFINITION "${VALIDATOR_DEFINITIONS}")
 list(APPEND FEATURES_LIBS validator_features_all)
 add_library(validator_features_validator OBJECT "validator_features_validator.c")
+set_target_properties(validator_features_validator PROPERTIES DEFINITION "${VALIDATOR_DEFINITIONS}")
 list(APPEND FEATURES_LIBS validator_features_validator)
 
 if (ARCH STREQUAL "i686")
 	set(DFA_VALIDATE_CALLER_INPUTS
 		"dfa_validate_32.c"
 		"dfa_validate_common.c"
 	)
-	add_library(dfa_validate_caller${ARCH_SUFFIX} STATIC ${DFA_VALIDATE_CALLER_INPUTS})
-	target_link_libraries(dfa_validate_caller${ARCH_SUFFIX} ${FEATURE_LIBS} validator32)
 elseif (ARCH STREQUAL "amd64")
 	set(DFA_VALIDATE_CALLER_INPUTS
 		"dfa_validate_64.c"
 		"dfa_validate_common.c"
 	)
-	add_library(dfa_validate_caller${ARCH_SUFFIX} STATIC ${DFA_VALIDATE_CALLER_INPUTS})
-	target_link_libraries(dfa_validate_caller${ARCH_SUFFIX} ${FEATURES_LIBS} validator64)
 endif()
 
+add_library(dfa_validate_caller${ARCH_SUFFIX} STATIC ${DFA_VALIDATE_CALLER_INPUTS})
+target_link_libraries(dfa_validate_caller${ARCH_SUFFIX} ${FEATURES_LIBS} ${VALIDATOR_LIB})
+set_target_properties(dfa_validate_caller${ARCH_SUFFIX} PROPERTIES DEFINITION "${VALIDATOR_DEFINITIONS}")
+
 add_library(dfa_validate_caller ALIAS dfa_validate_caller${ARCH_SUFFIX})