diff options
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/sql/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/map/txt/CMakeLists.txt | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/src/map/sql/CMakeLists.txt b/src/map/sql/CMakeLists.txt index 591e3e65b..68a8b750a 100644 --- a/src/map/sql/CMakeLists.txt +++ b/src/map/sql/CMakeLists.txt @@ -95,17 +95,14 @@ add_executable( map-server_sql ${SOURCE_FILES} ) add_dependencies( map-server_sql ${DEPENDENCIES} ) target_link_libraries( map-server_sql ${LIBRARIES} ${DEPENDENCIES} ) set_target_properties( map-server_sql PROPERTIES COMPILE_FLAGS "${DEFINITIONS}" ) -if( WITH_COMPONENT_RUNTIME ) +if( INSTALL_COMPONENT_RUNTIME ) cpack_add_component( Runtime_mapserver_sql DESCRIPTION "map-server (sql version)" DISPLAY_NAME "map-server_sql" GROUP Runtime ) install( TARGETS map-server_sql DESTINATION "." COMPONENT Runtime_mapserver_sql ) -endif() -set( HAVE_map-server_sql ON CACHE BOOL "map-server_sql target is available" ) -mark_as_advanced( HAVE_map-server_sql ) +endif( INSTALL_COMPONENT_RUNTIME ) set( TARGET_LIST ${TARGET_LIST} map-server_sql CACHE INTERNAL "" ) message( STATUS "Creating target map-server_sql - done" ) else() message( STATUS "Skipping target map-server_sql (requires common_sql; optional PCRE)" ) -unset( HAVE_map-server_sql CACHE ) endif() diff --git a/src/map/txt/CMakeLists.txt b/src/map/txt/CMakeLists.txt index 878ab68d2..409013e77 100644 --- a/src/map/txt/CMakeLists.txt +++ b/src/map/txt/CMakeLists.txt @@ -95,17 +95,14 @@ add_executable( map-server ${SOURCE_FILES} ) add_dependencies( map-server ${DEPENDENCIES} ) target_link_libraries( map-server ${LIBRARIES} ${DEPENDENCIES} ) set_target_properties( map-server PROPERTIES COMPILE_FLAGS "${DEFINITIONS}" ) -if( WITH_COMPONENT_RUNTIME ) +if( INSTALL_COMPONENT_RUNTIME ) cpack_add_component( Runtime_mapserver_txt DESCRIPTION "map-server (txt version)" DISPLAY_NAME "map-server" GROUP Runtime ) install( TARGETS map-server DESTINATION "." COMPONENT Runtime_mapserver_txt ) -endif() -set( HAVE_map-server ON CACHE BOOL "map-server target is available" ) -mark_as_advanced( HAVE_map-server ) +endif( INSTALL_COMPONENT_RUNTIME ) set( TARGET_LIST ${TARGET_LIST} map-server CACHE INTERNAL "" ) message( STATUS "Creating target map-server - done" ) else() message( STATUS "Skipping target map-server (requires common_base; optional PCRE)" ) -unset( HAVE_map-server CACHE ) endif() |