Merge branch 'feature/simox-targets-in-namespace' into 'master'

Simox targets exported in namespace Simox::

See merge request Simox/simox!62

CMakeLists.txt

@@ -261,8 +261,25 @@ MESSAGE (STATUS "** Simox: Generating CMake files for build and install setup")
 
 # Add all targets to the build-tree export set
 
-export(TARGETS ${SIMOX_EXPORT_TARGET_LIST}
-  FILE "${PROJECT_BINARY_DIR}/SimoxTargets.cmake")
+export(
+  TARGETS
+    ${SIMOX_EXPORT_TARGET_LIST}
+  NAMESPACE
+    Simox::
+  FILE
+    "${PROJECT_BINARY_DIR}/SimoxTargets.cmake"
+)
+
+
+export(
+  TARGETS
+    ${SIMOX_EXPORT_TARGET_LIST}
+#  NAMESPACE
+#    Simox::
+  FILE
+    "${PROJECT_BINARY_DIR}/SimoxTargetsLegacy.cmake"
+)
+
 
 # Export the package for use from the build-tree
 # (this registers the build-tree with a global CMake-registry)
@@ -390,5 +407,3 @@ else()
     add_custom_target(astyle
                       COMMENT "Unable to format source files: AStyle was not found!")
 endif()
-
-

CMakeModules/SimoxConfig.cmake.in

@@ -24,6 +24,7 @@ get_filename_component(Simox_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
 # Our library dependencies (contains definitions for IMPORTED targets)
 if(NOT TARGET Simox AND NOT Simox_BINARY_DIR)
   include("${Simox_CMAKE_DIR}/SimoxTargets.cmake")
+  include("${Simox_CMAKE_DIR}/SimoxTargetsLegacy.cmake")
 endif()
 # These are IMPORTED targets created by SimoxTargets.cmake
 set(Simox_LIBRARIES "@Simox_LIBRARIES@")