From 6a8aa716e7da2ff81343e00b1c3d7c263509ab99 Mon Sep 17 00:00:00 2001 From: lzwdgc Date: Tue, 29 Sep 2015 13:01:07 +0300 Subject: [PATCH] Make DATABASE_MANAGER_DIR unnecessary. --- CMakeLists.txt | 11 ++++++----- src/CMakeLists.txt | 2 ++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bececdf..680b43a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,12 +24,13 @@ else() endif(MSVC) if (NOT DATABASE_MANAGER_DIR) - message(FATAL_ERROR "Please, set DATABASE_MANAGER_DIR variable") + message(STATUS "DATABASE_MANAGER_DIR variable is not set! Some targets won't be built") +else() + add_subdirectory(${DATABASE_MANAGER_DIR} DatabaseManager) + include_directories(${DATABASE_MANAGER_DIR}/include) + set_target_properties(sqlite3 PROPERTIES FOLDER Extern) + set_target_properties(DatabaseManager PROPERTIES FOLDER Extern) endif() -add_subdirectory(${DATABASE_MANAGER_DIR} DatabaseManager) -include_directories(${DATABASE_MANAGER_DIR}/include) -set_target_properties(sqlite3 PROPERTIES FOLDER Extern) -set_target_properties(DatabaseManager PROPERTIES FOLDER Extern) if (Git_FOUND) add_custom_target(version ALL diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6d2f044..23c0dfe 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -12,6 +12,7 @@ endif() file(GLOB script2txt_src "script2txt/*") add_executable(script2txt ${script2txt_src}) +if (DATABASE_MANAGER_DIR) file(GLOB mmm_extractor_src "mmm_extractor/*") add_executable(mmm_extractor ${mmm_extractor_src}) target_link_libraries(mmm_extractor DatabaseManager common) @@ -19,6 +20,7 @@ target_link_libraries(mmm_extractor DatabaseManager common) file(GLOB mmo_extractor_src "mmo_extractor/*") add_executable(mmo_extractor ${mmo_extractor_src}) target_link_libraries(mmo_extractor DatabaseManager common) +endif() file(GLOB mmp_extractor_src "mmp_extractor/*") add_executable(mmp_extractor ${mmp_extractor_src})