Browse Source

Remove redundant conditional, add missing newline

Donny Lawrence 7 years ago
parent
commit
87a05913f8
2 changed files with 2 additions and 4 deletions
  1. 1 1
      panda/src/cocoadisplay/CMakeLists.txt
  2. 1 3
      panda/src/display/CMakeLists.txt

+ 1 - 1
panda/src/cocoadisplay/CMakeLists.txt

@@ -34,4 +34,4 @@ find_library(CARBON_LIBRARY Carbon)
 target_link_libraries(p3cocoadisplay
 target_link_libraries(p3cocoadisplay
   ${APPLICATIONSERVICES_LIBRARY} ${APPKIT_LIBRARY} ${CARBON_LIBRARY})
   ${APPLICATIONSERVICES_LIBRARY} ${APPKIT_LIBRARY} ${CARBON_LIBRARY})
 
 
-install(TARGETS p3cocoadisplay DESTINATION lib)
+install(TARGETS p3cocoadisplay DESTINATION lib)

+ 1 - 3
panda/src/display/CMakeLists.txt

@@ -90,9 +90,7 @@ composite_sources(p3display P3DISPLAY_SOURCES)
 add_component_library(p3display SYMBOL BUILDING_PANDA_DISPLAY
 add_component_library(p3display SYMBOL BUILDING_PANDA_DISPLAY
   ${P3DISPLAY_HEADERS} ${P3DISPLAY_SOURCES})
   ${P3DISPLAY_HEADERS} ${P3DISPLAY_SOURCES})
 target_link_libraries(p3display p3cull p3pgraphnodes)
 target_link_libraries(p3display p3cull p3pgraphnodes)
-if(HAVE_X11)
-  target_use_packages(p3display X11)
-endif()
+target_use_packages(p3display X11)
 target_interrogate(p3display ALL EXTENSIONS ${P3DISPLAY_IGATEEXT})
 target_interrogate(p3display ALL EXTENSIONS ${P3DISPLAY_IGATEEXT})
 
 
 install(TARGETS p3display DESTINATION lib)
 install(TARGETS p3display DESTINATION lib)