--- CMakeLists.txt.orig 2014-10-06 18:06:02.000000000 +0200 +++ CMakeLists.txt 2014-10-18 18:37:40.964417855 +0200 @@ -508,12 +508,10 @@ ENDIF() IF(NOT WITHOUT_SERVER) - ADD_SUBDIRECTORY(tests) ADD_SUBDIRECTORY(sql) 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) ENDIF() @@ -522,10 +520,7 @@ ADD_SUBDIRECTORY(scripts) IF(NOT WITHOUT_SERVER) - ADD_SUBDIRECTORY(mysql-test) - ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) ADD_SUBDIRECTORY(support-files) - ADD_SUBDIRECTORY(sql-bench) IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt) ADD_SUBDIRECTORY(internal) ENDIF() @@ -568,7 +563,6 @@ SET(CPACK_GENERATOR "TGZ") ENDIF() ADD_SUBDIRECTORY(packaging/WiX) -ADD_SUBDIRECTORY(packaging/solaris) # Create a single package with "make package" # (see http://public.kitware.com/Bug/view.php?id=11452) @@ -580,6 +574,7 @@ # # RPM installs documentation directly from the source tree # +IF(FALSE) IF(NOT INSTALL_LAYOUT MATCHES "RPM") INSTALL(FILES COPYING LICENSE.mysql DESTINATION ${INSTALL_DOCREADMEDIR} @@ -605,5 +600,6 @@ PATTERN "sp-imp-spec.txt" EXCLUDE ) ENDIF() +ENDIF() INCLUDE(CPack)