diff options
Diffstat (limited to 'src/modules/CMakeLists.txt')
| -rw-r--r-- | src/modules/CMakeLists.txt | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt index 1e153a933..dc7a2f54e 100644 --- a/src/modules/CMakeLists.txt +++ b/src/modules/CMakeLists.txt @@ -14,7 +14,7 @@ list(SORT MODULES_SRCS) #add_custom_target(modules) #add_dependencies(modules build) -set_source_files_properties(${MODULES_SRCS} PROPERTIES LANGUAGE CXX COMPILE_FLAGS "${CXXFLAGS}") +set_source_files_properties(${MODULES_SRCS} PROPERTIES LANGUAGE CXX COMPILE_FLAGS "${MODULE_CXXFLAGS}") foreach(SRC ${MODULES_SRCS}) string(REGEX REPLACE "\\.cpp$" ".x" SRC_X ${SRC}) @@ -39,11 +39,12 @@ foreach(SRC ${MODULES_SRCS}) if(${SRC}_HEADERS) foreach(HEADER ${${SRC}_HEADERS}) string(SUBSTRING ${HEADER} 0 1 FIRST_CHAR) - if(FIRST_CHAR STREQUAL "/") + string(SUBSTRING ${HEADER} 1 1 SECOND_CHAR) + if(FIRST_CHAR STREQUAL "/" OR SECOND_CHAR STREQUAL ":") set(HEADERS ${HEADERS} ${HEADER}) - else(FIRST_CHAR STREQUAL "/") + else(FIRST_CHAR STREQUAL "/" OR SECOND_CHAR STREQUAL ":") set(HEADERS ${HEADERS} ${Anope_SOURCE_DIR}/include/${HEADER}) - endif(FIRST_CHAR STREQUAL "/") + endif(FIRST_CHAR STREQUAL "/" OR SECOND_CHAR STREQUAL ":") endforeach(HEADER) endif(${SRC}_HEADERS) if(HEADERS) @@ -52,7 +53,11 @@ foreach(SRC ${MODULES_SRCS}) add_library(${SO} MODULE ${SRC}) add_dependencies(${SO} services) #set_target_properties(${SO} PROPERTIES PREFIX "" SUFFIX "" COMPILE_FLAGS ${CXXFLAGS}) - set_target_properties(${SO} PROPERTIES PREFIX "" SUFFIX "") + set_target_properties(${SO} PROPERTIES PREFIX "" SUFFIX "" LINK_FLAGS "${LDFLAGS}") + if(WIN32) + target_link_libraries(${SO} services wsock32) + endif(WIN32) + #set_target_properties(${SO} PROPERTIES PREFIX "" SUFFIX "") install(TARGETS ${SO} DESTINATION "${DATADIR}/modules" ) |