diff options
| author | ouwou <26526779+ouwou@users.noreply.github.com> | 2021-11-28 22:48:30 -0500 |
|---|---|---|
| committer | ouwou <26526779+ouwou@users.noreply.github.com> | 2021-11-28 22:48:30 -0500 |
| commit | e1703aea3fd597b23bde90e6c505278c517be611 (patch) | |
| tree | 37d98fc90c9cd0844388bfb79beda2204f44af92 /CMakeLists.txt | |
| parent | fd53a76bf6f53a095a639765923a30f2206b2cd6 (diff) | |
| parent | e02107feea8214a045e6faa969f00dcbc0d2b072 (diff) | |
| download | abaddon-portaudio-e1703aea3fd597b23bde90e6c505278c517be611.tar.gz abaddon-portaudio-e1703aea3fd597b23bde90e6c505278c517be611.zip | |
merge master
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 33 |
1 files changed, 7 insertions, 26 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 638be3e..fa56d6c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,17 +18,10 @@ set(USE_OPEN_SSL TRUE) find_package(IXWebSocket QUIET) if (NOT IXWebSocket_FOUND) message("ixwebsocket was not found and will be included as a submodule") - add_subdirectory(thirdparty/IXWebSocket) + add_subdirectory(subprojects/ixwebsocket) include_directories(IXWEBSOCKET_INCLUDE_DIRS) endif() -add_compile_definitions(SI_NO_CONVERSION) # only CSimpleIniA is used -find_package(simpleini QUIET) -if (NOT simpleini_FOUND) - message("simpleini was not found and will be included as a submodule") - include_directories(thirdparty/simpleini) -endif() - if(MINGW OR WIN32) link_libraries(ws2_32) endif() @@ -41,28 +34,16 @@ if(WIN32) link_libraries(${Fontconfig_LIBRARIES}) endif() -configure_file(${PROJECT_SOURCE_DIR}/config.h.in ${PROJECT_BINARY_DIR}/config.h) +configure_file(${PROJECT_SOURCE_DIR}/src/config.h.in ${PROJECT_BINARY_DIR}/config.h) -file(GLOB ABADDON_SOURCES - "*.h" - "*.hpp" - "*.cpp" - "discord/*.hpp" - "discord/*.cpp" - "components/*.hpp" - "components/*.cpp" - "windows/*.hpp" - "windows/*.cpp" - "windows/guildsettings/*.hpp" - "windows/guildsettings/*.cpp" - "windows/profile/*.hpp" - "windows/profile/*.cpp" - "dialogs/*.hpp" - "dialogs/*.cpp" +file(GLOB_RECURSE ABADDON_SOURCES + "src/*.h" + "src/*.hpp" + "src/*.cpp" ) add_executable(abaddon ${ABADDON_SOURCES}) -target_include_directories(abaddon PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) +target_include_directories(abaddon PUBLIC ${PROJECT_SOURCE_DIR}/src) target_include_directories(abaddon PUBLIC ${PROJECT_BINARY_DIR}) target_include_directories(abaddon PUBLIC ${GTKMM_INCLUDE_DIRS}) target_include_directories(abaddon PUBLIC ${ZLIB_INCLUDE_DIRS}) |