Make DATABASE_MANAGER_DIR unnecessary.

This commit is contained in:
lzwdgc 2015-09-29 13:01:07 +03:00
parent d130a1546d
commit 6a8aa716e7
2 changed files with 8 additions and 5 deletions

View file

@ -24,12 +24,13 @@ else()
endif(MSVC) endif(MSVC)
if (NOT DATABASE_MANAGER_DIR) 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() 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) if (Git_FOUND)
add_custom_target(version ALL add_custom_target(version ALL

View file

@ -12,6 +12,7 @@ endif()
file(GLOB script2txt_src "script2txt/*") file(GLOB script2txt_src "script2txt/*")
add_executable(script2txt ${script2txt_src}) add_executable(script2txt ${script2txt_src})
if (DATABASE_MANAGER_DIR)
file(GLOB mmm_extractor_src "mmm_extractor/*") file(GLOB mmm_extractor_src "mmm_extractor/*")
add_executable(mmm_extractor ${mmm_extractor_src}) add_executable(mmm_extractor ${mmm_extractor_src})
target_link_libraries(mmm_extractor DatabaseManager common) 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/*") file(GLOB mmo_extractor_src "mmo_extractor/*")
add_executable(mmo_extractor ${mmo_extractor_src}) add_executable(mmo_extractor ${mmo_extractor_src})
target_link_libraries(mmo_extractor DatabaseManager common) target_link_libraries(mmo_extractor DatabaseManager common)
endif()
file(GLOB mmp_extractor_src "mmp_extractor/*") file(GLOB mmp_extractor_src "mmp_extractor/*")
add_executable(mmp_extractor ${mmp_extractor_src}) add_executable(mmp_extractor ${mmp_extractor_src})