--- CMakeLists.txt.orig 2012-08-29 10:50:46.000000000 +0200 +++ CMakeLists.txt 2012-10-12 15:29:18.000000000 +0200 @@ -304,30 +304,11 @@ ENDIF() ADD_SUBDIRECTORY(extra) -IF(NOT WITHOUT_SERVER) - ADD_SUBDIRECTORY(tests) - ADD_SUBDIRECTORY(client) - ADD_SUBDIRECTORY(sql) - ADD_SUBDIRECTORY(sql/share) - ADD_SUBDIRECTORY(libservices) - OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF) - IF(WITH_EMBEDDED_SERVER) - ADD_SUBDIRECTORY(libmysqld) - ADD_SUBDIRECTORY(libmysqld/examples) - ENDIF(WITH_EMBEDDED_SERVER) - - ADD_SUBDIRECTORY(mysql-test) - ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) - ADD_SUBDIRECTORY(support-files) - ADD_SUBDIRECTORY(scripts) - ADD_SUBDIRECTORY(sql-bench) - IF(UNIX) - ADD_SUBDIRECTORY(man) - ENDIF() - IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt) - ADD_SUBDIRECTORY(internal) - ENDIF() -ENDIF() +ADD_SUBDIRECTORY(client) +ADD_SUBDIRECTORY(libservices) +ADD_SUBDIRECTORY(support-files) +ADD_SUBDIRECTORY(scripts) +ADD_SUBDIRECTORY(man) INCLUDE(cmake/abi_check.cmake) INCLUDE(cmake/tags.cmake) @@ -371,11 +352,11 @@ INCLUDE(CPack) IF(UNIX) - INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info) ENDIF() # # RPM installs documentation directly from the source tree # +IF(FALSE) IF(NOT INSTALL_LAYOUT MATCHES "RPM") INSTALL(FILES COPYING LICENSE.mysql DESTINATION ${INSTALL_DOCREADMEDIR} @@ -401,3 +382,4 @@ PATTERN "sp-imp-spec.txt" EXCLUDE ) ENDIF() +ENDIF()