Remove CMake config special case for Nominatim integration

Not needed any more, because Nominatim now works with stock osm2pgsql.

Author: joto

.github/workflows/test-install.yml

@@ -78,6 +78,7 @@ jobs:
         run: |
           test -d $PREFIX/bin
           test -e $PREFIX/bin/osm2pgsql
+          test -e $PREFIX/bin/osm2pgsql-expire
           test -e $PREFIX/bin/osm2pgsql-replication
           test -d $PREFIX/share/man/man1
           test -f $PREFIX/share/man/man1/osm2pgsql.1

CMakeLists.txt

@@ -7,15 +7,6 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
-# Do not create install targets when run as a subproject.
-# Currently used by Nominatim which cannot yet rely on installed versions
-# of osm2pgsql.
-if (${PROJECT_NAME} STREQUAL ${CMAKE_PROJECT_NAME})
-    set(ENABLE_INSTALL ON)
-else()
-    set(ENABLE_INSTALL OFF)
-endif()
-
 if (NOT ${CMAKE_SIZEOF_VOID_P} EQUAL 8)
     message(FATAL_ERROR "osm2pgsql needs a 64 bit architecture")
 endif()
@@ -328,12 +319,10 @@ add_subdirectory(man)
 
 include(GNUInstallDirs)
 
-if (ENABLE_INSTALL)
-    install(TARGETS osm2pgsql DESTINATION bin)
-    install(TARGETS osm2pgsql-expire DESTINATION bin)
-    install(FILES default.style empty.style DESTINATION share/osm2pgsql)
-    install(PROGRAMS scripts/osm2pgsql-replication DESTINATION bin)
-    if (BUILD_GEN)
-        install(TARGETS osm2pgsql-gen DESTINATION bin)
-    endif()
+install(TARGETS osm2pgsql DESTINATION bin)
+install(TARGETS osm2pgsql-expire DESTINATION bin)
+install(FILES default.style empty.style DESTINATION share/osm2pgsql)
+install(PROGRAMS scripts/osm2pgsql-replication DESTINATION bin)
+if (BUILD_GEN)
+    install(TARGETS osm2pgsql-gen DESTINATION bin)
 endif()

man/CMakeLists.txt

@@ -69,10 +69,8 @@ if(MANPAGE_TARGETS)
     add_custom_target(man DEPENDS ${MANPAGE_TARGETS} VERBATIM)
 endif()
 
-if(ENABLE_INSTALL)
-    install(FILES osm2pgsql.1 DESTINATION share/man/man1)
-    install(FILES osm2pgsql-replication.1 DESTINATION share/man/man1)
-    if (BUILD_GEN)
-        install(FILES osm2pgsql-gen.1 DESTINATION share/man/man1)
-    endif()
+install(FILES osm2pgsql.1 DESTINATION share/man/man1)
+install(FILES osm2pgsql-replication.1 DESTINATION share/man/man1)
+if (BUILD_GEN)
+    install(FILES osm2pgsql-gen.1 DESTINATION share/man/man1)
 endif()