Fix wxWidgets link as imported target

jundaozhilian · Oct 24, 2019 · 1ad432c · 1ad432c
1 parent b0ad9ec
commit 1ad432c
Show file tree

Hide file tree

Showing 136 changed files with 396 additions and 476 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -175,10 +175,6 @@ endif()
 set(MRPT_ENABLE_PRECOMPILED_HDRS ${default_use_precomp} CACHE BOOL "Enable precompiled headers")
 mark_as_advanced(MRPT_ENABLE_PRECOMPILED_HDRS)
 
-# Eigen library plugins:
-# ===================================================
-include(cmakemodules/script_eigen.cmake REQUIRED)
-
 # MRPT_TRY_START/END blocks
 # ===================================================
 set(MRPT_HAS_STACKED_EXCEPTIONS ON CACHE BOOL "Enable MRPT_TRY_START/END blocks (disable it for speed up).")
@@ -191,10 +187,9 @@ if (MRPT_ENABLE_EMBEDDED_GLOBAL_PROFILER)
 endif()
 
 # ASSERT_ blocks
-# ===================================================
 set(MRPT_HAS_ASSERT ON CACHE BOOL "Enable ASSERT_ statements (disable it for speed up).")
 
-#   "Classic" function & headers detection:
+# "Classic" function & headers detection:
 include(cmakemodules/script_detect_functions_headers.cmake REQUIRED)
 
 # MSVC only:
@@ -225,50 +220,47 @@ find_package(Threads) # Defines imported target Threads::Threads
 # ----------------------------------------------------------------------------
 # Other sub-scripts:
 # ----------------------------------------------------------------------------
-include(cmakemodules/script_gridmap_options.cmake REQUIRED) # Gridmap options
-
-include(cmakemodules/script_phidget.cmake REQUIRED)     # Support for phidget Interface Kit with proximity sensor device :
-include(cmakemodules/script_videre_svs.cmake REQUIRED)  # Support for Videre Design stereo camera:
+include(cmakemodules/script_assimp.cmake REQUIRED)      # Check for system assimp lib (3D models)
+include(cmakemodules/script_clang_tidy.cmake REQUIRED)  # Clang tidy
+include(cmakemodules/script_cvd.cmake REQUIRED)         # Check for CVD
+include(cmakemodules/script_duo3d.cmake REQUIRED)       # Support for DUO3D Camera
+include(cmakemodules/script_eigen.cmake REQUIRED)       # Eigen3
+include(cmakemodules/script_ffmpeg.cmake REQUIRED)      # Check for ffmpeg C libraries: libavcodec, libavutil, libavformat, libswscale
+include(cmakemodules/script_flycapture2.cmake REQUIRED) # Check for PointGreyResearch (PGR) FlyCapture2 library
 include(cmakemodules/script_ftdi.cmake REQUIRED)        # Check for the FTDI headers (Linux only, in win32 we use built-in header & dynamic DLL load):
-include(cmakemodules/script_inotify.cmake REQUIRED)     # Check for the sys/inotify headers (Linux only, in win32 we use the equivalent API for file system monitoring):
 include(cmakemodules/script_gl_glut.cmake REQUIRED)     # Check for the GL,GLUT libraries
+include(cmakemodules/script_gridmap_options.cmake REQUIRED) # Gridmap options
+include(cmakemodules/script_gtest.cmake REQUIRED)       # Unit testing lib
+include(cmakemodules/script_inotify.cmake REQUIRED)     # Check for the sys/inotify headers (Linux only, in win32 we use the equivalent API for file system monitoring):
+include(cmakemodules/script_isense.cmake REQUIRED)      # Support for INTERSENSE Sensors
+include(cmakemodules/script_iwyu.cmake REQUIRED)        # Include-what-you-use
+include(cmakemodules/script_jpeg.cmake REQUIRED)        # Check for jpeg
+include(cmakemodules/script_jsoncpp.cmake REQUIRED)     # Check for jsoncpp
+include(cmakemodules/script_kinect.cmake REQUIRED)      # Kinect support in a set of different ways
+include(cmakemodules/script_libdc1394.cmake REQUIRED)   # Check for libdc1394-2
+include(cmakemodules/script_liblas.cmake REQUIRED)      # Check for the LAS LiDAR format library
+include(cmakemodules/script_libtclap.cmake REQUIRED)    # Check for system libtclap
+include(cmakemodules/script_matlab.cmake REQUIRED)      # Support for Matlab MEX functions generation
+include(cmakemodules/script_national_instruments.cmake REQUIRED)  # NI C library
+include(cmakemodules/script_nite2.cmake REQUIRED)       # Check for NITE2 library
 include(cmakemodules/script_octomap.cmake REQUIRED)     # Check for the octomap library
 include(cmakemodules/script_opencv.cmake REQUIRED)      # Check for the OpenCV libraries (via pkg-config, CMake, with different options)
 include(cmakemodules/script_openni2.cmake REQUIRED)     # Check for the OpenNI2 library
-include(cmakemodules/script_wxwidgets.cmake REQUIRED)   # Check for wxWidgets + GL
+include(cmakemodules/script_pcap.cmake REQUIRED)        # Check for the libpcap library
+include(cmakemodules/script_phidget.cmake REQUIRED)     # Support for phidget Interface Kit with proximity sensor device :
 include(cmakemodules/script_qt.cmake REQUIRED)          # Check for wxWidgets + GL
-include(cmakemodules/script_libdc1394.cmake REQUIRED)   # Check for libdc1394-2
-include(cmakemodules/script_assimp.cmake REQUIRED)      # Check for system assimp lib (3D models)
-include(cmakemodules/script_liblas.cmake REQUIRED)      # Check for the LAS LiDAR format library
-include(cmakemodules/script_libtclap.cmake REQUIRED)    # Check for system libtclap
-include(cmakemodules/script_zlib.cmake REQUIRED)        # Check for zlib
-include(cmakemodules/script_jpeg.cmake REQUIRED)        # Check for jpeg
-include(cmakemodules/script_swissrange.cmake REQUIRED)  # Support for SWISSRANGE 3D camera:
+include(cmakemodules/script_ros1.cmake REQUIRED)        # Check for ROS1
 include(cmakemodules/script_SIMD.cmake REQUIRED)        # SSE2/SSE3/... optimization options
-include(cmakemodules/script_gtest.cmake REQUIRED)       # Unit testing lib
-include(cmakemodules/script_national_instruments.cmake REQUIRED)  # NI C library
-include(cmakemodules/script_xsens.cmake REQUIRED)       # XSens Motion trackers / IMU drivers
-include(cmakemodules/script_flycapture2.cmake REQUIRED) # Check for PointGreyResearch (PGR) FlyCapture2 library
+include(cmakemodules/script_suitesparse.cmake REQUIRED) # SuiteSparse libs
+include(cmakemodules/script_swissrange.cmake REQUIRED)  # Support for SWISSRANGE 3D camera:
 include(cmakemodules/script_triclops.cmake REQUIRED)    # Check for PointGreyResearch (PGR) Triclops library
-include(cmakemodules/script_duo3d.cmake REQUIRED)       # Support for DUO3D Camera
-include(cmakemodules/script_matlab.cmake REQUIRED)      # Support for Matlab MEX functions generation
-include(cmakemodules/script_isense.cmake REQUIRED)      # Support for INTERSENSE Sensors
-include(cmakemodules/script_nite2.cmake REQUIRED)       # Check for NITE2 library
+include(cmakemodules/script_videre_svs.cmake REQUIRED)  # Support for Videre Design stereo camera:
+include(cmakemodules/script_wxwidgets.cmake REQUIRED)   # Check for wxWidgets + GL
+include(cmakemodules/script_xsens.cmake REQUIRED)       # XSens Motion trackers / IMU drivers
 include(cmakemodules/script_yamlcpp.cmake REQUIRED)     # Check for YAMLCPP library
-include(cmakemodules/script_pcap.cmake REQUIRED)        # Check for the libpcap library
-include(cmakemodules/script_clang_tidy.cmake REQUIRED)  # Clang tidy
-include(cmakemodules/script_iwyu.cmake REQUIRED)        # Include-what-you-use
-include(cmakemodules/script_cvd.cmake REQUIRED)         # Check for CVD
-include(cmakemodules/script_jsoncpp.cmake REQUIRED)     # Check for jsoncpp
-include(cmakemodules/script_kinect.cmake REQUIRED)  # Kinect support in a set of different ways
-include(cmakemodules/script_suitesparse.cmake REQUIRED)     # SuiteSparse libs
-include(cmakemodules/script_ros1.cmake REQUIRED)       # Check for ROS
-
-# Don't include these ones *here*, since their modules polute the global namespace!
-#include(cmakemodules/script_ffmpeg.cmake REQUIRED)      # Check for ffmpeg C libraries: libavcodec, libavutil, libavformat, libswscale
+include(cmakemodules/script_zlib.cmake REQUIRED)        # Check for zlib
 
-#include(cmakemodules/script_pcl.cmake REQUIRED)     # PCL library
-# Instead:
+# PCL library: include indirectly, see comments in that subdirectory:
 add_subdirectory(cmakemodules/probe_pcl)
 
 
@@ -281,8 +273,6 @@ mark_as_advanced(FORCE MRPT_ALWAYS_CHECKS_DEBUG)
 option(MRPT_ALWAYS_CHECKS_DEBUG_MATRICES "Additional checks even in Release (Only in matrix classes)" "OFF")
 mark_as_advanced(FORCE MRPT_ALWAYS_CHECKS_DEBUG_MATRICES)
 
-set(CMAKE_MRPT_HAS_GZ_STREAMS ${CMAKE_MRPT_HAS_ZLIB})   # We have gz-streams is we have zlib:
-
 # Include Asian fonts in utils::CMRPTCanvas ?
 set( MRPT_HAS_ASIAN_FONTS ON CACHE BOOL "Enable Asian fonts in CMRPTCanvas (increases library size).")
 
@@ -612,19 +602,22 @@ add_custom_target(all_mrpt_libs ALL) # all_mrpt_libs: target to build all mrpt-*
 #      					PROCESS SUBDIRECTORIES:
 # ----------------------------------------------------------------------------
 add_subdirectory(otherlibs)   # The third-party libraries
-add_subdirectory(libs)        # The MRPT C++ libraries:
+add_subdirectory(libs)        # The MRPT C++ libraries
 
-set( BUILD_APPLICATIONS ON CACHE BOOL "If you only want the MRPT libraries, disable this.")
+set(BUILD_APPLICATIONS ON CACHE BOOL "If you only want the MRPT libraries, disable this.")
 if(BUILD_APPLICATIONS)
 	add_subdirectory(apps)    # The applications:
 endif()
 
 if(BUILD_MATLAB)
-        add_subdirectory(mex/apps)# The MEX applications
+    add_subdirectory(mex/apps)# The MEX applications
 endif()
 
 # Generate .h to locate MRPT sources:
-configure_file("${CMAKE_SOURCE_DIR}/parse-files/mrpt_paths_config.h.in" "${MRPT_CONFIG_FILE_INCLUDE_DIR}/mrpt/mrpt_paths_config.h")
+configure_file(
+    "${CMAKE_SOURCE_DIR}/parse-files/mrpt_paths_config.h.in"
+	"${MRPT_CONFIG_FILE_INCLUDE_DIR}/mrpt/mrpt_paths_config.h"
+	)
 
 # Documentation targets (must be AFTER "apps" because it uses the aux program "mrpt-perfdata2html")
 add_subdirectory(doc)

diff --git a/apps/2d-slam-demo/CMakeLists.txt b/apps/2d-slam-demo/CMakeLists.txt
@@ -28,7 +28,7 @@ endif()
 add_executable(${PROJECT_NAME} WIN32 ${SRCS} ${MRPT_VERSION_RC_FILE})
 
 # Add the required libraries for linking:
-target_link_libraries(${PROJECT_NAME} ${wxWidgets_LIBRARIES})
+target_link_libraries(${PROJECT_NAME} imp_wxwidgets)
 
 # Dependencies on MRPT libraries:
 #  Just mention the top-level dependency, the rest will be detected automatically,

diff --git a/apps/GridmapNavSimul/CMakeLists.txt b/apps/GridmapNavSimul/CMakeLists.txt
@@ -29,7 +29,7 @@ endif()
 add_executable(${PROJECT_NAME} WIN32 ${SRCS}  ${MRPT_VERSION_RC_FILE})
 
 # Add the required libraries for linking:
-target_link_libraries(${PROJECT_NAME} ${wxWidgets_LIBRARIES} )
+target_link_libraries(${PROJECT_NAME} imp_wxwidgets )
 
 # Dependencies on MRPT libraries:
 #  Just mention the top-level dependency, the rest will be detected automatically,

diff --git a/apps/RawLogViewer/CMakeLists.txt b/apps/RawLogViewer/CMakeLists.txt
@@ -43,7 +43,7 @@ endif()
 add_executable(${PROJECT_NAME} WIN32 ${SRCS} ${MRPT_VERSION_RC_FILE})
 
 # Add the required libraries for linking:
-target_link_libraries(${PROJECT_NAME} ${wxWidgets_LIBRARIES} mrptwxthings)
+target_link_libraries(${PROJECT_NAME} imp_wxwidgets mrptwxthings)
 
 
 # Dependencies on MRPT libraries:

diff --git a/apps/ReactiveNavigationDemo/CMakeLists.txt b/apps/ReactiveNavigationDemo/CMakeLists.txt
@@ -28,7 +28,7 @@ endif()
 add_executable(${PROJECT_NAME} WIN32 ${SRCS} ${MRPT_VERSION_RC_FILE})
 
 # Add the required libraries for linking:
-target_link_libraries(${PROJECT_NAME} ${wxWidgets_LIBRARIES} mrptwxthings)
+target_link_libraries(${PROJECT_NAME} imp_wxwidgets mrptwxthings)
 
 # Dependencies on MRPT libraries:
 #  Just mention the top-level dependency, the rest will be detected automatically,

diff --git a/apps/SceneViewer3D/CMakeLists.txt b/apps/SceneViewer3D/CMakeLists.txt
@@ -33,7 +33,7 @@ add_executable(${PROJECT_NAME} WIN32 ${SRCS} ${MRPT_VERSION_RC_FILE})
 
 # Add the required libraries for linking:
 target_link_libraries(${PROJECT_NAME}
-	${wxWidgets_LIBRARIES}
+	imp_wxwidgets
 	${MRPT_OPENGL_LIBS}
 	${LAS_LIBS}
 	mrptwxthings

diff --git a/apps/camera-calib/CMakeLists.txt b/apps/camera-calib/CMakeLists.txt
@@ -29,7 +29,7 @@ add_executable(${PROJECT_NAME} WIN32 ${SRCS} ${MRPT_VERSION_RC_FILE})
 
 
 # Add the required libraries for linking:
-target_link_libraries(${PROJECT_NAME} ${wxWidgets_LIBRARIES} )
+target_link_libraries(${PROJECT_NAME} imp_wxwidgets )
 
 # Dependencies on MRPT libraries:
 #  Just mention the top-level dependency, the rest will be detected automatically,

diff --git a/apps/hmt-slam-gui/CMakeLists.txt b/apps/hmt-slam-gui/CMakeLists.txt
@@ -34,7 +34,7 @@ add_executable(${PROJECT_NAME} WIN32 ${SRCS} ${MRPT_VERSION_RC_FILE})
 
 # Add the required libraries for linking:
 target_link_libraries(${PROJECT_NAME}
-	${wxWidgets_LIBRARIES}
+	imp_wxwidgets
 	mrptwxthings
 	)
 

diff --git a/apps/hmtMapViewer/CMakeLists.txt b/apps/hmtMapViewer/CMakeLists.txt
@@ -30,7 +30,7 @@ add_executable(${PROJECT_NAME} WIN32 ${SRCS} ${MRPT_VERSION_RC_FILE})
 
 # Add the required libraries for linking:
 target_link_libraries(${PROJECT_NAME}
-	${wxWidgets_LIBRARIES}
+	imp_wxwidgets
 	)
 
 # Dependencies on MRPT libraries:

diff --git a/apps/holonomic-navigator-demo/CMakeLists.txt b/apps/holonomic-navigator-demo/CMakeLists.txt
@@ -26,7 +26,7 @@ add_executable(${PROJECT_NAME} WIN32 ${SRCS} ${MRPT_VERSION_RC_FILE})
 
 # Add the required libraries for linking:
 target_link_libraries(${PROJECT_NAME}
-	${wxWidgets_LIBRARIES}
+	imp_wxwidgets
 	mrptwxthings
 	)
 

diff --git a/apps/kinect-stereo-calib/CMakeLists.txt b/apps/kinect-stereo-calib/CMakeLists.txt
@@ -26,7 +26,7 @@ endif()
 add_executable(${PROJECT_NAME} WIN32 ${SRCS} ${MRPT_VERSION_RC_FILE})
 
 # Add the required libraries for linking:
-target_link_libraries(${PROJECT_NAME} ${wxWidgets_LIBRARIES} )
+target_link_libraries(${PROJECT_NAME} imp_wxwidgets )
 
 # Dependencies on MRPT libraries:
 #  Just mention the top-level dependency, the rest will be detected automatically,

diff --git a/apps/navlog-viewer/CMakeLists.txt b/apps/navlog-viewer/CMakeLists.txt
@@ -30,7 +30,7 @@ if(UNIX)
 endif()
 
 # Add the required libraries for linking:
-target_link_libraries(${PROJECT_NAME} ${wxWidgets_LIBRARIES} mrptwxthings)
+target_link_libraries(${PROJECT_NAME} imp_wxwidgets mrptwxthings)
 
 # Dependencies on MRPT libraries:
 #  Just mention the top-level dependency, the rest will be detected automatically,

diff --git a/apps/ptg-configurator/CMakeLists.txt b/apps/ptg-configurator/CMakeLists.txt
@@ -22,7 +22,7 @@ endif()
 add_executable(${PROJECT_NAME} WIN32 ${SRCS} ${MRPT_VERSION_RC_FILE})
 
 # Add the required libraries for linking:
-target_link_libraries(${PROJECT_NAME} ${wxWidgets_LIBRARIES} )
+target_link_libraries(${PROJECT_NAME} imp_wxwidgets )
 target_link_libraries(${PROJECT_NAME} ${MRPT_LINKER_LIBS})
 
 # -ldl required by the plugin load mechanism of this app:

diff --git a/apps/robotic-arm-kinematics/CMakeLists.txt b/apps/robotic-arm-kinematics/CMakeLists.txt
@@ -27,7 +27,7 @@ add_executable(${PROJECT_NAME} WIN32 ${SRCS} ${MRPT_VERSION_RC_FILE})
 
 # Add the required libraries for linking:
 target_link_libraries(${PROJECT_NAME}
-	${wxWidgets_LIBRARIES}
+	imp_wxwidgets
 	mrptwxthings
 	)
 

diff --git a/cmakemodules/script_ffmpeg.cmake b/cmakemodules/script_ffmpeg.cmake
@@ -2,9 +2,10 @@
 #  These libs are linked against mrpt-hwdrivers only (in shared libs,
 #  in static all user apps will have to link against this)
 # ====================================================================
-set(CMAKE_MRPT_HAS_FFMPEG 0  PARENT_SCOPE)
-set(CMAKE_MRPT_HAS_FFMPEG_SYSTEM 0 PARENT_SCOPE)
-set(MRPT_FFMPEG_LIBS_TO_LINK "" PARENT_SCOPE)
+set(CMAKE_MRPT_HAS_FFMPEG 0)
+set(CMAKE_MRPT_HAS_FFMPEG_SYSTEM 0)
+set(MRPT_FFMPEG_LIBRARIES "")
+set(MRPT_FFMPEG_INCLUDE_DIRS "")
 
 # DISABLE_FFMPEG
 # ---------------------
@@ -56,10 +57,10 @@ if(PKG_CONFIG_FOUND)
 			link_directories("${LIBSWSCALE_LIBDIR}")
 		endif()
 
-		set(MRPT_FFMPEG_LIBS_TO_LINK "${MRPT_FFMPEG_LIBS_TO_LINK}" "${LIBAVCODEC_LIBRARIES}" "${LIBAVFORMAT_LIBRARIES}" "${LIBAVUTIL_LIBRARIES}" "${LIBSWSCALE_LIBRARIES}" PARENT_SCOPE)
+		set(MRPT_FFMPEG_LIBRARIES "${MRPT_FFMPEG_LIBRARIES}" "${LIBAVCODEC_LIBRARIES}" "${LIBAVFORMAT_LIBRARIES}" "${LIBAVUTIL_LIBRARIES}" "${LIBSWSCALE_LIBRARIES}")
 
 		if($ENV{VERBOSE})
-			message(STATUS " ffmpeg libs: ${MRPT_FFMPEG_LIBS_TO_LINK}")
+		    message(STATUS " ffmpeg libs: ${MRPT_FFMPEG_LIBRARIES}")
 		endif($ENV{VERBOSE})
 	endif(LIBAVCODEC_FOUND AND LIBAVUTIL_FOUND AND LIBAVFORMAT_FOUND AND LIBSWSCALE_FOUND)
 endif()
@@ -129,8 +130,8 @@ if(MRPT_HAS_FFMPEG_WIN32)
 	#include_directories("${FFMPEG_WIN32_ROOT_DIR}/include/libavutil")
 	include_directories("${FFMPEG_WIN32_ROOT_DIR}/include/libswscale")
 
-	set(MRPT_FFMPEG_LIBS_TO_LINK ${MRPT_FFMPEG_LIBS_TO_LINK} "${FFMPEG_WIN32_AVCODEC_LIB}" "${FFMPEG_WIN32_AVUTIL_LIB}" "${FFMPEG_WIN32_AVFORMAT_LIB}" "${FFMPEG_WIN32_SWSCALE_LIB}")
-endif(MRPT_HAS_FFMPEG_WIN32)
+	set(MRPT_FFMPEG_LIBRARIES ${MRPT_FFMPEG_LIBRARIES} "${FFMPEG_WIN32_AVCODEC_LIB}" "${FFMPEG_WIN32_AVUTIL_LIB}" "${FFMPEG_WIN32_AVFORMAT_LIB}" "${FFMPEG_WIN32_SWSCALE_LIB}")
+endif()
 
 
 # -- install DLLs --

diff --git a/libs/gui/CMakeLists.txt b/libs/gui/CMakeLists.txt
@@ -46,6 +46,9 @@ if(BUILD_mrpt-gui)
 	endif()
 
 	if(CMAKE_MRPT_HAS_WXWIDGETS)
+		if (NOT TARGET imp_wxwidgets)
+			message(ERROR "imp_wxwidgets should be defined!")
+		endif()
 		target_link_libraries(gui PRIVATE imp_wxwidgets)
 	endif()