Set project language and other CMake tweaks

roboticslab-uc3m · Jun 18, 2018 · 83a5efe · 83a5efe
1 parent 61b7204
commit 83a5efe
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 14 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,7 +5,7 @@
 cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
 
 # Start a project.
-project(ASIBOT_HMI)
+project(ASIBOT_HMI LANGUAGES CXX)
 
 # Set module path.
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
@@ -22,10 +22,6 @@ include(ASIBOT_HMISystem)
 # Setup build options.
 include(ASIBOT_HMIOptions)
 
-# Define global properties to store relevant configuration.
-set_property(GLOBAL PROPERTY ASIBOT_HMI_INCLUDE_DIRS)
-set_property(GLOBAL PROPERTY ASIBOT_HMI_TARGETS)
-
 # Define and enter subdirectories.
 add_subdirectory(share)
 #add_subdirectory(libraries)

diff --git a/cmake/ASIBOT_HMIDescribe.cmake b/cmake/ASIBOT_HMIDescribe.cmake
@@ -49,8 +49,7 @@ install(FILES ${CMAKE_BINARY_DIR}/ASIBOT_HMIConfig.cmake.install
 # https://github.com/roboticslab-uc3m/project-generator/issues/19
 if(_exported_targets)
     # <pkg>Targets.cmake (build tree).
-    # In CMake 3.0 or later: export(EXPORT ASIBOT_HMI...)
-    export(TARGETS ${_exported_targets}
+    export(EXPORT ASIBOT_HMI
            NAMESPACE ROBOTICSLAB::
            FILE ASIBOT_HMITargets.cmake)
 

diff --git a/cmake/ASIBOT_HMIDoc.cmake b/cmake/ASIBOT_HMIDoc.cmake
@@ -22,4 +22,3 @@ if(DOXYGEN_FOUND)
   # Register features.
   add_feature_info(ASIBOT_HMI_docs ASIBOT_HMI_DOXYGEN_HTML "ASIBOT_HMI documentation generator.")
 endif()
-
diff --git a/cmake/ASIBOT_HMIOptions.cmake b/cmake/ASIBOT_HMIOptions.cmake
@@ -30,4 +30,3 @@ endif()
 if(MSVC)
   mark_as_advanced(CMAKE_BUILD_TYPE)
 endif()
-
diff --git a/cmake/ASIBOT_HMIPackage.cmake b/cmake/ASIBOT_HMIPackage.cmake
@@ -111,4 +111,3 @@ endif()
 
 # Launch CPack.
 include(CPack)
-
diff --git a/cmake/ASIBOT_HMISystem.cmake b/cmake/ASIBOT_HMISystem.cmake
@@ -11,10 +11,9 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
 
 # Add "d" postfix to debug libraries on Windows.
 if(MSVC)
-  message(STATUS "Running on windows")    
+  message(STATUS "Running on windows")
   set(CMAKE_DEBUG_POSTFIX "d")
 endif()
 
 # Install system runtime libraries.
 include(InstallRequiredSystemLibraries)
-
diff --git a/cmake/ASIBOT_HMIVersion.cmake b/cmake/ASIBOT_HMIVersion.cmake
@@ -47,4 +47,3 @@ endif()
 
 # Print version.
 message(STATUS "ASIBOT_HMI version: ${ASIBOT_HMI_VERSION_SHORT} (${ASIBOT_HMI_VERSION})")
-
diff --git a/programs/CMakeLists.txt b/programs/CMakeLists.txt
@@ -5,4 +5,3 @@
 if(ENABLE_webInterface)
   add_subdirectory(webInterface)
 endif()
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -22,4 +22,3 @@ if(DOXYGEN_FOUND)
		# Register features.
		add_feature_info(ASIBOT_HMI_docs ASIBOT_HMI_DOXYGEN_HTML "ASIBOT_HMI documentation generator.")
		endif()
Original file line number	Diff line number	Diff line change
Expand Up		@@ -30,4 +30,3 @@ endif()
		if(MSVC)
		mark_as_advanced(CMAKE_BUILD_TYPE)
		endif()
Original file line number	Diff line number	Diff line change
Expand Up		@@ -111,4 +111,3 @@ endif()

		# Launch CPack.
		include(CPack)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -47,4 +47,3 @@ endif()

		# Print version.
		message(STATUS "ASIBOT_HMI version: ${ASIBOT_HMI_VERSION_SHORT} (${ASIBOT_HMI_VERSION})")
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,4 +5,3 @@
		if(ENABLE_webInterface)
		add_subdirectory(webInterface)
		endif()