Changeset 7459 for code/trunk/cmake

Timestamp:

Sep 17, 2010, 12:48:29 AM (14 years ago)

Author:

adrfried

Message:

Merged ipv6 branch

Orxonox now includes a modified version of ENet 1.3.0

Location:

code/trunk

Files:

• . (modified) (1 prop)
• cmake/LibraryConfig.cmake (modified) (3 diffs)
• cmake/PackageConfig.cmake (modified) (1 diff)

code/trunk/cmake/LibraryConfig.cmake

@@ -94 +94 @@
 
 FIND_PACKAGE(OGRE  1.4       REQUIRED)
-FIND_PACKAGE(ENet  1.1       REQUIRED)
+#FIND_PACKAGE(ENet  1.1       REQUIRED)
 FIND_PACKAGE(Ogg             REQUIRED)
 FIND_PACKAGE(Vorbis          REQUIRED)
@@ -177 +177 @@
   OPTION(LINK_BOOST_DYNAMIC "Link Boost dynamically on Windows" TRUE)
   OPTION(LINK_CEGUI_DYNAMIC "Link CEGUI dynamicylly on Windows" TRUE)
-  OPTION(LINK_ENET_DYNAMIC  "Link ENet dynamically on Windows" TRUE)
+  #OPTION(LINK_ENET_DYNAMIC  "Link ENet dynamically on Windows" TRUE)
   OPTION(LINK_OGRE_DYNAMIC  "Link OGRE dynamically on Windows" TRUE)
   OPTION(LINK_TCL_DYNAMIC   "Link TCL dynamically on Windows" TRUE)
@@ -190 +190 @@
   IF(DEPENDENCY_PACKAGE_ENABLE)
     MARK_AS_ADVANCED(
-      LINK_BOOST_DYNAMIC LINK_CEGUI_DYNAMIC LINK_ENET_DYNAMIC
+      LINK_BOOST_DYNAMIC LINK_CEGUI_DYNAMIC #LINK_ENET_DYNAMIC
       LINK_OGRE_DYNAMIC  LINK_TCL_DYNAMIC   LINK_ZLIB_DYNAMIC
       LINK_LUA_DYNAMIC

code/trunk/cmake/PackageConfig.cmake

@@ -83 +83 @@
 SET(ENV{DBGHELP_DIR}           ${DEP_INCLUDE_DIR}/dbghelp)
 SET(ENV{DXSDK_DIR}             ${DEP_INCLUDE_DIR}/directx)
-SET(ENV{ENETDIR}               ${DEP_INCLUDE_DIR}/enet)
+#SET(ENV{ENETDIR}               ${DEP_INCLUDE_DIR}/enet)
 SET(ENV{LUA_DIR}               ${DEP_INCLUDE_DIR}/lua)
 SET(ENV{OGGDIR}                ${DEP_INCLUDE_DIR}/libogg)