diff options
| author | Adam <Adam@anope.org> | 2013-03-15 15:10:53 -0500 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2013-03-15 15:10:53 -0500 |
| commit | f5377329efe802f090525560e0d14a1d32443da7 (patch) | |
| tree | f4b5ea6d6d4d8f0b2d9757be2574fd368621adfc | |
| parent | efdf336d8c6fad41fef418ef341f8b6af5e12cf4 (diff) | |
Link win32_memory too inspircd too
| -rw-r--r-- | win/CMakeLists.txt | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/win/CMakeLists.txt b/win/CMakeLists.txt index 288aa2d7b..83d6dddb5 100644 --- a/win/CMakeLists.txt +++ b/win/CMakeLists.txt @@ -36,8 +36,12 @@ if(MSVC) set(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO} /SAFESEH:NO") endif(MSVC) -file(GLOB INSPIRCD_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${INSPIRCD_BASE}/win/inspircd_win32wrapper.cpp" "${INSPIRCD_BASE}/win/win32service.cpp" "${INSPIRCD_BASE}/src/*.cpp" "${INSPIRCD_BASE}/src/modes/*.cpp" "${INSPIRCD_BASE}/src/socketengines/socketengine_select.cpp") -list(APPEND INSPIRCD_SOURCES "${INSPIRCD_BASE}/src/threadengines/threadengine_win32.cpp") +file(GLOB INSPIRCD_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} +"${INSPIRCD_BASE}/win/inspircd_win32wrapper.cpp" +"${INSPIRCD_BASE}/win/win32service.cpp" "${INSPIRCD_BASE}/src/*.cpp" +"${INSPIRCD_BASE}/src/modes/*.cpp" +"${INSPIRCD_BASE}/src/socketengines/socketengine_select.cpp" +"${INSPIRCD_BASE}/src/threadengines/threadengine_win32.cpp") list(SORT INSPIRCD_SOURCES) include_directories("${INSPIRCD_BASE}/win" "${INSPIRCD_BASE}/include") @@ -45,14 +49,16 @@ include_directories("${INSPIRCD_BASE}/win" "${INSPIRCD_BASE}/include") include_directories(${EXTRA_INCLUDES}) link_directories(${EXTRA_LIBS}) +if(MSVC) + add_library(win32_memory STATIC "${INSPIRCD_BASE}/win/inspircd_memory_functions.cpp") +endif(MSVC) + configure_file("${INSPIRCD_BASE}/win/inspircd.rc.cmake" "${INSPIRCD_BASE}/win/inspircd.rc") add_executable(inspircd ${INSPIRCD_SOURCES} "${INSPIRCD_BASE}/win/inspircd.rc") +target_link_libraries(inspircd win32_memory) set_target_properties(inspircd PROPERTIES ENABLE_EXPORTS ON) install(TARGETS inspircd DESTINATION .) -if(MSVC) - add_library(win32_memory STATIC "${INSPIRCD_BASE}/win/inspircd_memory_functions.cpp") -endif(MSVC) add_subdirectory(modules) # Package any DLLs in win/ |