[mapguide-commits] r9722 - trunk/MgDev/cmake/modules

[svn_mapguide at osgeo.org]

Author: jng
Date: 2020-08-24 08:07:43 -0700 (Mon, 24 Aug 2020)
New Revision: 9722

Removed:
   trunk/MgDev/cmake/modules/FindCppUnit.cmake
Modified:
   trunk/MgDev/cmake/modules/FindDbXmlInternal.cmake
Log:
Fix incorrect dbxml lib detection for a fully self-contained (everything internal) MapGuide build. Fixes #2816

Deleted: trunk/MgDev/cmake/modules/FindCppUnit.cmake
===================================================================
--- trunk/MgDev/cmake/modules/FindCppUnit.cmake	2020-08-24 12:39:12 UTC (rev 9721)
+++ trunk/MgDev/cmake/modules/FindCppUnit.cmake	2020-08-24 15:07:43 UTC (rev 9722)
@@ -1,60 +0,0 @@
-# - Try to find cppunit
-# Once done this will define
-#
-#  CPPUNIT_FOUND - System has cppunit
-#  CPPUNIT_INCLUDE_DIR - The cppunit include directory
-#  CPPUNIT_LIBRARY_DIR - The cppunit library dir
-#  CPPUNIT_LIBRARIES - The libraries needed to use cppunit
-#  CPPUNIT_DEFINITIONS - Compiler switches required for using cppunit
-
-# Copyright (c) 2009, Helio Chissini de Castro, <helio at kde.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-
-IF (CPPUNIT_INCLUDE_DIR AND CPPUNIT_LIBRARIES)
-   # in cache already
-   SET(cppunit_FIND_QUIETLY TRUE)
-ENDIF (CPPUNIT_INCLUDE_DIR AND CPPUNIT_LIBRARIES)
-
-IF (NOT WIN32)
-   # use pkg-config to get the directories and then use these values
-   # in the FIND_PATH() and FIND_LIBRARY() calls
-   FIND_PACKAGE(PkgConfig)
-   PKG_CHECK_MODULES(PC_CPPUNIT cppunit)
-   SET(CPPUNIT_DEFINITIONS ${PC_CPPUNIT_CFLAGS_OTHER})
-   SET(CPPUNIT_LIBRARY_DIR ${PC_CPPUNIT_LIBRARY_DIRS})
-ENDIF (NOT WIN32)
-
-FIND_PATH(CPPUNIT_INCLUDE_DIR cppunit/CompilerOutputter.h
-   HINTS
-   ${PC_CPPUNIT_INCLUDEDIR}
-   ${PC_CPPUNIT_INCLUDE_DIRS}
-   PATH_SUFFIXES cppunit
-   )
-
-FIND_LIBRARY(CPPUNIT_LIBRARIES NAMES cppunit
-   HINTS
-   ${PC_CPPUNIT_LIBDIR}
-   ${PC_CPPUNIT_LIBRARY_DIRS}
-   )
-
-INCLUDE(FindPackageHandleStandardArgs)
-
-# handle the QUIETLY and REQUIRED arguments and set CPPUNIT_FOUND to TRUE if 
-# all listed variables are TRUE
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(cppunit DEFAULT_MSG CPPUNIT_LIBRARIES CPPUNIT_INCLUDE_DIR)
-
-IF(CPPUNIT_FOUND)
-	TRY_COMPILE(CPPUNIT_MODERN_API ${CMAKE_BINARY_DIR}
-		${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/TestCmakeVersion.cxx )
-
-	IF(CPPUNIT_MODERN_API)
-		MESSAGE(STATUS "CPPUNIT uses modern API ( > 1.10 )")
-		ADD_DEFINITIONS(-DCPPUNIT_MODERN_API)
-	ENDIF(CPPUNIT_MODERN_API)
-
-	MARK_AS_ADVANCED(CPPUNIT_INCLUDE_DIR CPPUNIT_LIBRARIES CPPUNIT_LIBRARY_DIR)
-ENDIF(CPPUNIT_FOUND)
-

Modified: trunk/MgDev/cmake/modules/FindDbXmlInternal.cmake
===================================================================
--- trunk/MgDev/cmake/modules/FindDbXmlInternal.cmake	2020-08-24 12:39:12 UTC (rev 9721)
+++ trunk/MgDev/cmake/modules/FindDbXmlInternal.cmake	2020-08-24 15:07:43 UTC (rev 9722)
@@ -18,14 +18,41 @@
     PATHS ${MG_OEM_WORK_DIR}/dbxml/install/include)
 find_library(DBXML_LIBRARY 
     NAMES dbxml 
+    HINTS ${MG_OEM_WORK_DIR}/dbxml/install/lib
     PATHS ${MG_OEM_WORK_DIR}/dbxml/install/lib)
 find_library(DB_CXX_LIBRARY 
     NAMES db_cxx 
+    HINTS ${MG_OEM_WORK_DIR}/dbxml/install/lib
     PATHS ${MG_OEM_WORK_DIR}/dbxml/install/lib)
 find_library(XQILLA_LIBRARY 
     NAMES xqilla 
+    HINTS ${MG_OEM_WORK_DIR}/dbxml/install/lib
     PATHS ${MG_OEM_WORK_DIR}/dbxml/install/lib)
 
+if (NOT DBXML_INCLUDE_DIR)
+    message(FATAL "Could not find DbXml include directory")
+else (NOT DBXML_INCLUDE_DIR)
+    message(STATUS "Found DbXml Include: ${DBXML_INCLUDE_DIR}")
+endif (NOT DBXML_INCLUDE_DIR)
+    
+if (NOT DBXML_LIBRARY)
+    message(FATAL "Could not find DbXml Library")
+else (NOT DBXML_LIBRARY)
+    message(STATUS "Found DbXml Library: ${DBXML_LIBRARY}")
+endif (NOT DBXML_LIBRARY)
+    
+if (NOT DB_CXX_LIBRARY)
+    message(FATAL "Could not find BDB C++ Library")
+else (NOT DB_CXX_LIBRARY)
+    message(STATUS "Found BDB C++ Library: ${DB_CXX_LIBRARY}")
+endif (NOT DB_CXX_LIBRARY)
+    
+if (NOT XQILLA_LIBRARY)
+    message(FATAL "Could not find XQilla Library")
+else (NOT XQILLA_LIBRARY)
+    message(STATUS "Found XQilla Library: ${XQILLA_LIBRARY}")
+endif (NOT XQILLA_LIBRARY)
+
 if (NOT INTERNAL_XERCES)
     
     include(FindPackageHandleStandardArgs)
@@ -33,10 +60,6 @@
     # all listed variables are TRUE
     FIND_PACKAGE_HANDLE_STANDARD_ARGS(DbXmlInternal DEFAULT_MSG DBXML_LIBRARY DB_CXX_LIBRARY XQILLA_LIBRARY DBXML_INCLUDE_DIR)
 
-    if (DbXmlInternal_FOUND)
-        message(STATUS "Found DbXml: ${DBXML_INCLUDE_DIR}, ${DBXML_LIBRARY}, ${DB_CXX_LIBRARY}, ${XQILLA_LIBRARY}")
-    endif (DbXmlInternal_FOUND)
-
     mark_as_advanced(DBXML_INCLUDE_DIR DBXML_LIBRARY DB_CXX_LIBRARY XQILLA_LIBRARY)
 
 else (NOT INTERNAL_XERCES)
@@ -50,10 +73,6 @@
     # all listed variables are TRUE
     FIND_PACKAGE_HANDLE_STANDARD_ARGS(DbXmlInternal DEFAULT_MSG DBXML_LIBRARY DB_CXX_LIBRARY XQILLA_LIBRARY XERCESC_LIBRARIES DBXML_INCLUDE_DIR)
 
-    if (DbXmlInternal_FOUND)
-        message(STATUS "Found DbXml: ${DBXML_INCLUDE_DIR}, ${DBXML_LIBRARY}, ${DB_CXX_LIBRARY}, ${XQILLA_LIBRARY}, ${XERCESC_LIBRARIES}")
-    endif (DbXmlInternal_FOUND)
-
     mark_as_advanced(DBXML_INCLUDE_DIR DBXML_LIBRARY DB_CXX_LIBRARY XQILLA_LIBRARY XERCESC_LIBRARIES)
 
 endif (NOT INTERNAL_XERCES)