Selaa lähdekoodia

Changed build order; cip linking to enet_encap

Bill McCormick 6 vuotta sitten
vanhempi
sitoutus
0f84b35a9a
3 muutettua tiedostoa jossa 2 lisäystä ja 2 poistoa
  1. 1 1
      source/src/CMakeLists.txt
  2. 1 0
      source/src/cip/CMakeLists.txt
  3. 0 1
      source/src/ports/CMakeLists.txt

+ 1 - 1
source/src/CMakeLists.txt

@@ -1,9 +1,9 @@
 #######################################
 # Add subdirectories                  #
 #######################################
+add_subdirectory( enet_encap )
 add_subdirectory( cip )
 add_subdirectory( cip_objects )
-add_subdirectory( enet_encap )
 add_subdirectory( ports )
 add_subdirectory( utils )
 

+ 1 - 0
source/src/cip/CMakeLists.txt

@@ -17,6 +17,7 @@ set( CIP_SRC appcontype.c cipassembly.c cipclass3connection.c cipcommon.c cipcon
 add_library( CIP ${CIP_SRC} )
 
 if( BUILD_SHARED_LIBS )
+  target_link_libraries(CIP ENET_ENCAP)
   install(TARGETS CIP
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}

+ 0 - 1
source/src/ports/CMakeLists.txt

@@ -29,7 +29,6 @@ if( BUILD_SHARED_LIBS )
     USE_SOURCE_PERMISSIONS
     FILES_MATCHING
       PATTERN "*.h"
-      PATTERN "*.h.in"
       PATTERN "sample_application" EXCLUDE
    )
 endif( BUILD_SHARED_LIBS )