X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=CMakeLists.txt;h=0032d570dc37497264e1ca38b43a0d6eed8d4395;hb=a5d4c4f2e8bd10de42bb5a0bfa20acaceaf2e67a;hp=5b736640bd68a113f98b1311e0025c69edc73890;hpb=94fc4366adedbf26ca6ef3104f88d41fa85f5a72;p=anna.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5b73664..0032d57 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,9 +26,9 @@ endif(NOT CMAKE_BUILD_TYPE)
 message(STATUS "CMAKE_BUILD_TYPE = ${CMAKE_BUILD_TYPE}")
 
 # Build output directory:
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY build/${CMAKE_BUILD_TYPE}/bin)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY build/${CMAKE_BUILD_TYPE}/lib)
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY build/${CMAKE_BUILD_TYPE}/lib)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/build/${CMAKE_BUILD_TYPE}/bin)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/build/${CMAKE_BUILD_TYPE}/lib)
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/build/${CMAKE_BUILD_TYPE}/lib)
 message(STATUS "CMAKE_RUNTIME_OUTPUT_DIRECTORY is ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
 message(STATUS "CMAKE_LIBRARY_OUTPUT_DIRECTORY is ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
 message(STATUS "CMAKE_ARCHIVE_OUTPUT_DIRECTORY is ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}")
@@ -100,6 +100,15 @@ MACRO(SUBDIRLIST result curdir)
   FILE(GLOB children RELATIVE ${curdir} ${curdir}/*)
   SET(dirlist "")
   FOREACH(child ${children})
+
+    # EXCLUDE DATABASE RESOURCES (-DSKIP_DATABASE_BUILD)
+    if(SKIP_DATABASE_BUILD)
+       string(REGEX MATCH "dbms|dbos" DATABASE ${child})
+       IF(DATABASE)
+         CONTINUE()
+       ENDIF()
+    ENDIF()
+
     IF(IS_DIRECTORY ${curdir}/${child})
       LIST(APPEND dirlist ${child})
     ENDIF()
@@ -113,7 +122,7 @@ add_definitions(-DLDAP_DEPRECATED)
 # General includes:
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
 include_directories(/usr/include/libxml2)
-include_directories(/usr/lib/oracle/12.1/client64/include)
+include_directories(/usr/include/oracle/19.6/client64)
 
 # <source>
 SUBDIRLIST(SUBDIRS ${CMAKE_CURRENT_SOURCE_DIR}/source)
@@ -136,7 +145,7 @@ FOREACH(procedure ${DYNAMIC_PROCEDURES})
   file(GLOB_RECURSE SRCS dynamic/launcher/${rel}/*.cpp)
   add_library(anna_launcher_procedure_${libpath}_shared SHARED ${SRCS})
 
-  set(target_dirname build/${CMAKE_BUILD_TYPE}/lib/dynamic/launcher/${rel})
+  set(target_dirname ${CMAKE_CURRENT_SOURCE_DIR}/build/${CMAKE_BUILD_TYPE}/lib/dynamic/launcher/${rel})
 
   set(target_basename anna_launcher_procedure_${libpath}_shared)
   set_target_properties(${target_basename} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${target_dirname})