[cmake] Remove cotire usage

* It doesn't work with cmake >= 3.12 and M$ VC++ (not a big issue) * It doesn't work with extern "C" properly (blocks FFMPEG) * It's unmaintained
2019-05-05 14:45:51 +03:00 · 2019-05-05 14:45:51 +03:00 · 5af65a58f3
parent 04c6b40c50
commit 5af65a58f3
14 changed files with 0 additions and 21 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -99,12 +99,6 @@ endif()
 include(CheckIncludeFiles)
 include(CheckIncludeFileCXX)
 include(FastMath)
-if(NOT WIN32)
-  include(cotire)
-else()
-  macro(cotire _target)
-  endmacro()
-endif()

 #
 # Compile options
--- a/src/cel3ds/CMakeLists.txt
+++ b/src/cel3ds/CMakeLists.txt
@ -7,4 +7,3 @@ set(CEL3DS_SOURCES
 )

 add_library(cel3ds OBJECT ${CEL3DS_SOURCES})
-cotire(cel3ds)
--- a/src/celengine/CMakeLists.txt
+++ b/src/celengine/CMakeLists.txt
@ -175,4 +175,3 @@ set(CELENGINE_SOURCES
 )

 add_library(celengine OBJECT ${CELENGINE_SOURCES})
-cotire(celengine)
--- a/src/celephem/CMakeLists.txt
+++ b/src/celephem/CMakeLists.txt
@ -46,5 +46,3 @@ endif()

 # These object files are merged in the celegine library
 add_library(celephem OBJECT ${CELEPHEM_SOURCES})
-
-cotire(celephem)
--- a/src/celestia/CMakeLists.txt
+++ b/src/celestia/CMakeLists.txt
@ -73,7 +73,6 @@ if(APPLE)
  target_link_libraries(celestia "-framework Foundation")
 endif()

-cotire(celestia)

 install(TARGETS celestia LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} NAMELINK_SKIP)

--- a/src/celestia/gtk/CMakeLists.txt
+++ b/src/celestia/gtk/CMakeLists.txt
@ -61,7 +61,6 @@ endif()

 add_executable(celestia-gtk ${GTK_SOURCES})
 add_dependencies(celestia-gtk celestia)
-cotire(celestia-gtk)

 if(${CMAKE_VERSION} VERSION_LESS "3.13.0")
  function(target_link_directories target scope)
--- a/src/celestia/qt/CMakeLists.txt
+++ b/src/celestia/qt/CMakeLists.txt
@ -66,7 +66,6 @@ endif()

 add_executable(celestia-qt WIN32 ${QT_SOURCES} ${RC_SRC} ${RES})
 add_dependencies(celestia-qt celestia)
-cotire(celestia-qt)
 target_link_libraries(celestia-qt Qt5::Widgets Qt5::OpenGL celestia)
 if(APPLE)
  set_property(TARGET celestia-qt APPEND_STRING PROPERTY LINK_FLAGS " -framework CoreFoundation")
--- a/src/celestia/win32/CMakeLists.txt
+++ b/src/celestia/win32/CMakeLists.txt
@ -45,6 +45,5 @@ set(RESOURCES $<TARGET_OBJECTS:resources>)

 add_executable(celestia-win WIN32 ${WIN32_SOURCES} ${RESOURCES})
 add_dependencies(celestia-win celestia)
-cotire(celestia-win)
 target_link_libraries(celestia-win celestia)
 install(TARGETS celestia-win RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
--- a/src/celimage/CMakeLists.txt
+++ b/src/celimage/CMakeLists.txt
@ -9,4 +9,3 @@ set(CELIMAGE_SOURCES
 )

 add_library(celimage OBJECT ${CELIMAGE_SOURCES})
-#cotire(celimage)
--- a/src/celmath/CMakeLists.txt
+++ b/src/celmath/CMakeLists.txt
@ -14,4 +14,3 @@ set(CELMATH_SOURCES
 )

 add_library(celmath OBJECT ${CELMATH_SOURCES})
-cotire(celmath)
--- a/src/celmodel/CMakeLists.txt
+++ b/src/celmodel/CMakeLists.txt
@ -10,4 +10,3 @@ set(CELMODEL_SOURCES
 )

 add_library(celmodel OBJECT ${CELMODEL_SOURCES})
-cotire(celmodel)
--- a/src/celtxf/CMakeLists.txt
+++ b/src/celtxf/CMakeLists.txt
@ -16,6 +16,4 @@ set_target_properties(celtxf PROPERTIES
 add_dependencies(celtxf celutil)
 target_link_libraries(celtxf celutil)

-cotire(celtxf)
-
 #install(TARGETS celtxf LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- a/src/celutil/CMakeLists.txt
+++ b/src/celutil/CMakeLists.txt
@ -45,4 +45,3 @@ if (APPLE)
 endif()

 add_library(celutil OBJECT ${CELUTIL_SOURCES})
-cotire(celutil)
--- a/src/tools/cmod/common/CMakeLists.txt
+++ b/src/tools/cmod/common/CMakeLists.txt
@ -8,4 +8,3 @@ set(CMODCOMMON_SOURCES
 )

 add_library(cmodcommon STATIC ${CMODCOMMON_SOURCES})
-cotire(cmodcommon)