Merge pull request #484 from MRPT/remove-dbg-libs-linux

Use -dbg postfix for libs only in MSVC
Closes #484

Author: jlblancoc

CMakeLists.txt

@@ -87,11 +87,13 @@ include(cmakemodules/script_detect_clang.cmake REQUIRED)     # Detect clang comp
 
 # ------------------------------------------
 # We want libraries to be named "libXXX"
-#  and "libXXX-dbg" in all compilers:
+#  in all compilers, and and "libXXX-dbg" in MSVC
 # ------------------------------------------
-set(CMAKE_DEBUG_POSTFIX  "-dbg")
 IF(MSVC)
 	set(MRPT_LIB_PREFIX "lib")  # Libs are: "libXXX"
+	set(CMAKE_DEBUG_POSTFIX  "-dbg")
+ELSE()
+	set(CMAKE_DEBUG_POSTFIX "")
 ENDIF()
 
 # In case of Makefiles if the user does not setup CMAKE_BUILD_TYPE, assume it's Release:
@@ -440,12 +442,12 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
 	# The -Wno-long-long is required in 64bit systems when including sytem headers.
 	# The -Wno-variadic-macros was needed for Eigen3, StdVector.h
  	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CONFIGURE_CFLAGS} -Wall -Wno-long-long -Wno-variadic-macros")
-	
+
 	# Workaround: Eigen <3.3 produces *tons* of warnings in GCC >=6. See http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1221
 	IF (NOT CMAKE_MRPT_GCC_VERSION LESS 60 AND "${MRPT_EIGEN_VERSION}" VERSION_LESS "3.3")
 		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-ignored-attributes")
 	ENDIF()
-	
+
   IF(NOT APPLE)
     # This causes the option "-Wnorite-strings" to be set on gcc-4.9 on OS X
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-write-strings")
@@ -635,14 +637,7 @@ SET( MEX_EXECUTABLE_OUTPUT_PATH ${MRPT_BINARY_DIR}/mex/test CACHE PATH "Output d
 IF(CMAKE_MRPT_USE_DEB_POSTFIXS)
 	# Values when building a Debian package ---------------
 	MESSAGE(STATUS "** mrpt cmake: Using Debian post-fix for install directories **")
-	IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
-		# Debug packages
-		SET(libmrpt_dev_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/libmrpt-dbg/usr/")
-	ELSE()
-		# Normal packages
-		SET(libmrpt_dev_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/libmrpt-dev/usr/")
-	ENDIF()
-
+	SET(libmrpt_dev_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/libmrpt-dev/usr/")
 	SET(mrpt_apps_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/mrpt-apps/usr/")
 	SET(mrpt_doc_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/mrpt-doc/usr/")
 	SET(mrpt_common_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/mrpt-common/usr/")
@@ -668,7 +663,7 @@ STRING(REGEX REPLACE "/STACK:[0-9]+" "/STACK:1000000" CMAKE_SHARED_LINKER_FLAGS
 #  dependencies stored in "mrpt-${name}_LIB_DEPS"
 SET(ALL_MRPT_LIBS "" CACHE INTERNAL "")  # This emulates global vars
 
-IF (NOT CMAKE_VERSION VERSION_LESS "2.8.12")
+IF (NOT MSVC AND NOT CMAKE_VERSION VERSION_LESS "2.8.12")
 	include(cmakemodules/cotire.cmake REQUIRED) # COmpiler TIme REducer helper for PCH
 	set_directory_properties(PROPERTIES COTIRE_ADD_UNITY_BUILD FALSE) # Disable unity targets
 ENDIF()

cmakemodules/DeclareAppDependencies.cmake

@@ -41,9 +41,9 @@ macro(DeclareAppDependencies name)
 				TARGET_LINK_LIBRARIES(${name} ${_DEP}${MRPT_LINKER_LIBS_POSTFIX})
 				LIST(APPEND AUX_EXTRA_LINK_LIBS
 					optimized ${MRPT_LIB_PREFIX}${DEP}${MRPT_DLL_VERSION_POSTFIX}
-					debug     ${MRPT_LIB_PREFIX}${DEP}${MRPT_DLL_VERSION_POSTFIX}-dbg) #Old: ${DEP}${MRPT_LINKER_LIBS_POSTFIX})
+					debug     ${MRPT_LIB_PREFIX}${DEP}${MRPT_DLL_VERSION_POSTFIX}${CMAKE_DEBUG_POSTFIX})
 			endif (NOT _LIB_HDRONLY)
-			
+
 			# Include:
 			STRING(REGEX REPLACE "mrpt-(.*)" "\\1" DEP_MRPT_NAME ${_DEP})
 			IF(NOT "${DEP_MRPT_NAME}" STREQUAL "")

cmakemodules/DeclareMRPTLib.cmake

@@ -187,7 +187,7 @@ macro(internal_define_mrpt_lib name headers_only is_metalib)
 						#MESSAGE(STATUS "adding link dep: mrpt-${name} -> ${DEP}")
 						LIST(APPEND AUX_EXTRA_LINK_LIBS
 							optimized ${MRPT_LIB_PREFIX}${DEP}${MRPT_DLL_VERSION_POSTFIX}
-							debug     ${MRPT_LIB_PREFIX}${DEP}${MRPT_DLL_VERSION_POSTFIX}-dbg) #Old: ${DEP}${MRPT_LINKER_LIBS_POSTFIX})
+							debug     ${MRPT_LIB_PREFIX}${DEP}${MRPT_DLL_VERSION_POSTFIX}${CMAKE_DEBUG_POSTFIX})
 					ENDIF(NOT _LIB_HDRONLY)
 				ENDIF(NOT ${headers_only})
 
@@ -239,7 +239,7 @@ macro(internal_define_mrpt_lib name headers_only is_metalib)
 		SET_TARGET_PROPERTIES(mrpt-${name} PROPERTIES
 			OUTPUT_NAME ${MRPT_LIB_PREFIX}mrpt-${name}${MRPT_DLL_VERSION_POSTFIX}
 			COMPILE_PDB_NAME "${MRPT_LIB_PREFIX}mrpt-${name}${MRPT_DLL_VERSION_POSTFIX}"
-			COMPILE_PDB_NAME_DEBUG "${MRPT_LIB_PREFIX}mrpt-${name}${MRPT_DLL_VERSION_POSTFIX}-dbg"
+			COMPILE_PDB_NAME_DEBUG "${MRPT_LIB_PREFIX}mrpt-${name}${MRPT_DLL_VERSION_POSTFIX}${CMAKE_DEBUG_POSTFIX}"
 			ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/"
 			RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/"
 			VERSION "${CMAKE_MRPT_VERSION_NUMBER_MAJOR}.${CMAKE_MRPT_VERSION_NUMBER_MINOR}.${CMAKE_MRPT_VERSION_NUMBER_PATCH}"
@@ -328,7 +328,7 @@ macro(internal_define_mrpt_lib name headers_only is_metalib)
 			# Collect .pdb debug files for optional installation:
 			IF (MSVC)
 				SET(PDB_FILE
-					"${CMAKE_BINARY_DIR}/bin/Debug/${MRPT_LIB_PREFIX}mrpt-${name}${MRPT_DLL_VERSION_POSTFIX}-dbg.pdb")
+					"${CMAKE_BINARY_DIR}/bin/Debug/${MRPT_LIB_PREFIX}mrpt-${name}${MRPT_DLL_VERSION_POSTFIX}${CMAKE_DEBUG_POSTFIX}.pdb")
 				IF (EXISTS "${PDB_FILE}")
 					INSTALL(FILES ${PDB_FILE} DESTINATION bin COMPONENT LibrariesDebugInfoPDB)
 				ENDIF ()

parse-files/MRPTConfig.cmake.in

@@ -30,9 +30,9 @@
 #    - MRPT_VERSION_{MAJOR,MINOR,PATCH}: 3 variables for the version parts
 #
 #   Optional input variables:
-#    - MRPT_DONT_USE_DBG_LIBS: If defined at input, before the
-#         "FIND_PACKAGE(MRPT...)", and set to "1", the release libraries
-#         will be used even for linking against "Debug" CMake builds.
+#    - (Windows only) MRPT_DONT_USE_DBG_LIBS: If defined at input, before the
+#         "FIND_PACKAGE(MRPT...)", and set to "1", will not search for `-dbg`
+#         libraries when linking in "Debug" CMake builds.
 #
 # =========================================================================
 
@@ -180,10 +180,10 @@ FOREACH(MRPTLIB ${MRPT_FIND_COMPONENTS})
 	# If the required lib is header-only, don't add to the list of libs to link!
 	get_property(_LIB_HDRONLY GLOBAL PROPERTY "mrpt-${MRPTLIB}_LIB_IS_HEADERS_ONLY")
 	IF(NOT _LIB_HDRONLY)
-		IF(NOT MRPT_DONT_USE_DBG_LIBS)
+		IF(WIN32 AND NOT MRPT_DONT_USE_DBG_LIBS)
 			LIST(APPEND MRPT_LIBRARIES
 				optimized @MRPT_LIB_PREFIX@mrpt-${MRPTLIB}@MRPT_DLL_VERSION_POSTFIX@
-				debug     @MRPT_LIB_PREFIX@mrpt-${MRPTLIB}@MRPT_DLL_VERSION_POSTFIX@-dbg)
+				debug     @MRPT_LIB_PREFIX@mrpt-${MRPTLIB}@MRPT_DLL_VERSION_POSTFIX@@CMAKE_DEBUG_POSTFIX@)
 		ELSE()
 			LIST(APPEND MRPT_LIBRARIES  @MRPT_LIB_PREFIX@mrpt-${MRPTLIB}@MRPT_DLL_VERSION_POSTFIX@)
 		ENDIF()